Compare commits
2 Commits
d9f3bb185f
...
f56646f906
| Author | SHA1 | Date | |
|---|---|---|---|
| f56646f906 | |||
| 89fc70a8ea |
@ -124,6 +124,7 @@
|
|||||||
.dashboard-navigation-fade {
|
.dashboard-navigation-fade {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
|
/* Incoming chrome waits for the outgoing fade, then fades in. */
|
||||||
transition:
|
transition:
|
||||||
opacity 0.2s ease 0.2s,
|
opacity 0.2s ease 0.2s,
|
||||||
visibility 0s linear 0.2s;
|
visibility 0s linear 0.2s;
|
||||||
@ -133,9 +134,14 @@
|
|||||||
opacity: 0;
|
opacity: 0;
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
/*
|
||||||
|
Visibility must use a non-zero duration on hide. A 0s visibility
|
||||||
|
transition makes WebKit apply hidden immediately, so opacity never
|
||||||
|
animates and the chrome glitches out instead of fading.
|
||||||
|
*/
|
||||||
transition:
|
transition:
|
||||||
opacity 0.2s ease 0s,
|
opacity 0.2s ease 0s,
|
||||||
visibility 0s linear 0.2s;
|
visibility 0.2s linear 0s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dashboard-navigation-window-title {
|
.dashboard-navigation-window-title {
|
||||||
@ -162,7 +168,7 @@
|
|||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
/* Wait for outgoing chrome to finish fading before this line appears. */
|
/* Wait for outgoing chrome to finish fading before this line appears. */
|
||||||
transition: opacity 0s ease 0s;
|
transition: opacity 0.2s ease 0s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dashboard-navigation-center-border-hidden {
|
.dashboard-navigation-center-border-hidden {
|
||||||
|
|||||||
@ -27,7 +27,10 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import OrderItemIcon from '../../../Icons/OrderItemIcon.jsx'
|
import OrderItemIcon from '../../../Icons/OrderItemIcon.jsx'
|
||||||
import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
|
import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
|
||||||
|
|
||||||
@ -91,7 +94,7 @@ const InvoiceInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -100,6 +103,7 @@ const InvoiceInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -257,7 +261,9 @@ const InvoiceInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='payment'
|
type='payment'
|
||||||
masterFilter={{ invoice: getModelByName('invoice').prefix + ':' + invoiceId }}
|
masterFilter={{
|
||||||
|
invoice: getModelByName('invoice').prefix + ':' + invoiceId
|
||||||
|
}}
|
||||||
visibleColumns={{ invoice: false }}
|
visibleColumns={{ invoice: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -291,10 +297,7 @@ const InvoiceInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('invoice').prefix + ':' + invoiceId
|
||||||
getModelByName('invoice').prefix +
|
|
||||||
':' +
|
|
||||||
invoiceId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -93,7 +93,7 @@ const PaymentPolicyInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -84,7 +84,7 @@ const PaymentInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -93,6 +93,7 @@ const PaymentInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -77,7 +77,7 @@ const TaxRecordInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -85,7 +85,7 @@ const TaxRecordInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -213,9 +213,7 @@ const TaxRecordInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('taxRecord').prefix +
|
getModelByName('taxRecord').prefix + ':' + taxRecordId
|
||||||
':' +
|
|
||||||
taxRecordId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -87,7 +87,7 @@ const FilamentStockInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -197,7 +197,12 @@ const FilamentStockInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='stockEvent'
|
type='stockEvent'
|
||||||
masterFilter={{ parent: getModelByName('filamentStock').prefix + ':' + filamentStockId }}
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('filamentStock').prefix +
|
||||||
|
':' +
|
||||||
|
filamentStockId
|
||||||
|
}}
|
||||||
visibleColumns={{ parent: false }}
|
visibleColumns={{ parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@ -78,7 +78,7 @@ const OrderItemInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -88,6 +88,7 @@ const OrderItemInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -224,9 +225,7 @@ const OrderItemInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('orderItem').prefix +
|
getModelByName('orderItem').prefix + ':' + orderItemId
|
||||||
':' +
|
|
||||||
orderItemId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -93,6 +93,7 @@ const PartStockInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -214,7 +215,10 @@ const PartStockInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='stockEvent'
|
type='stockEvent'
|
||||||
masterFilter={{ parent: getModelByName('partStock').prefix + ':' + partStockId }}
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('partStock').prefix + ':' + partStockId
|
||||||
|
}}
|
||||||
visibleColumns={{ parent: false }}
|
visibleColumns={{ parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -272,9 +276,7 @@ const PartStockInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('partStock').prefix +
|
getModelByName('partStock').prefix + ':' + partStockId
|
||||||
':' +
|
|
||||||
partStockId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -109,6 +109,7 @@ const ProductStockInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -102,7 +102,7 @@ const PurchaseOrderInfo = () => {
|
|||||||
orderItemsTableRef?.current?.handleUpdate?.()
|
orderItemsTableRef?.current?.handleUpdate?.()
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -111,6 +111,7 @@ const PurchaseOrderInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -230,7 +231,10 @@ const PurchaseOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='orderItem'
|
type='orderItem'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
order:
|
||||||
|
getModelByName('purchaseOrder').prefix +
|
||||||
|
':' +
|
||||||
|
purchaseOrderId,
|
||||||
orderType: 'purchaseOrder'
|
orderType: 'purchaseOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
@ -249,7 +253,10 @@ const PurchaseOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='shipment'
|
type='shipment'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
order:
|
||||||
|
getModelByName('purchaseOrder').prefix +
|
||||||
|
':' +
|
||||||
|
purchaseOrderId,
|
||||||
orderType: 'purchaseOrder'
|
orderType: 'purchaseOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
@ -271,7 +278,10 @@ const PurchaseOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='invoice'
|
type='invoice'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
order:
|
||||||
|
getModelByName('purchaseOrder').prefix +
|
||||||
|
':' +
|
||||||
|
purchaseOrderId,
|
||||||
orderType: 'purchaseOrder'
|
orderType: 'purchaseOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
@ -293,7 +303,10 @@ const PurchaseOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='stockEvent'
|
type='stockEvent'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
owner: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId
|
owner:
|
||||||
|
getModelByName('purchaseOrder').prefix +
|
||||||
|
':' +
|
||||||
|
purchaseOrderId
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@ -121,6 +121,7 @@ const PurchaseOrderInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -233,7 +234,10 @@ const PurchaseOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='orderItem'
|
type='orderItem'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
order:
|
||||||
|
getModelByName('purchaseOrder').prefix +
|
||||||
|
':' +
|
||||||
|
purchaseOrderId,
|
||||||
orderType: 'purchaseOrder'
|
orderType: 'purchaseOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
@ -252,7 +256,10 @@ const PurchaseOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='shipment'
|
type='shipment'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
order:
|
||||||
|
getModelByName('purchaseOrder').prefix +
|
||||||
|
':' +
|
||||||
|
purchaseOrderId,
|
||||||
orderType: 'purchaseOrder'
|
orderType: 'purchaseOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
|
|||||||
@ -96,6 +96,7 @@ const ShipmentInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -26,7 +26,10 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('StockAuditInfo')
|
const log = loglevel.getLogger('StockAuditInfo')
|
||||||
@ -92,6 +95,7 @@ const StockAuditInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -180,7 +184,9 @@ const StockAuditInfo = () => {
|
|||||||
title='Stock Audit Information'
|
title='Stock Audit Information'
|
||||||
icon={<InfoCircleIcon />}
|
icon={<InfoCircleIcon />}
|
||||||
active={collapseState.info}
|
active={collapseState.info}
|
||||||
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
collapseKey='info'
|
collapseKey='info'
|
||||||
>
|
>
|
||||||
<ObjectInfo
|
<ObjectInfo
|
||||||
@ -262,9 +268,7 @@ const StockAuditInfo = () => {
|
|||||||
title='Audit Logs'
|
title='Audit Logs'
|
||||||
icon={<AuditLogIcon />}
|
icon={<AuditLogIcon />}
|
||||||
active={collapseState.auditLogs}
|
active={collapseState.auditLogs}
|
||||||
onToggle={(expanded) =>
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
collapseKey='auditLogs'
|
||||||
>
|
>
|
||||||
{objectFormState.loading ? (
|
{objectFormState.loading ? (
|
||||||
@ -274,9 +278,7 @@ const StockAuditInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('stockAudit').prefix +
|
getModelByName('stockAudit').prefix + ':' + stockAuditId
|
||||||
':' +
|
|
||||||
stockAuditId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -98,6 +98,7 @@ const StockLocationInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -8,7 +8,10 @@ import InfoCollapse from '../../common/InfoCollapse.jsx'
|
|||||||
import ObjectInfo from '../../common/ObjectInfo.jsx'
|
import ObjectInfo from '../../common/ObjectInfo.jsx'
|
||||||
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
||||||
import ViewButton from '../../common/ViewButton.jsx'
|
import ViewButton from '../../common/ViewButton.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
|
import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
|
||||||
import NoteIcon from '../../../Icons/NoteIcon.jsx'
|
import NoteIcon from '../../../Icons/NoteIcon.jsx'
|
||||||
import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
|
import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
|
||||||
@ -89,7 +92,7 @@ const StockTransferInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current.handleUpdate()
|
objectFormRef?.current.handleUpdate()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -98,6 +101,7 @@ const StockTransferInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -87,7 +87,7 @@ const AppPasswordInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -197,9 +197,7 @@ const AppPasswordInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('appPassword').prefix +
|
getModelByName('appPassword').prefix + ':' + appPasswordId
|
||||||
':' +
|
|
||||||
appPasswordId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -25,7 +25,10 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('CourierServiceInfo')
|
const log = loglevel.getLogger('CourierServiceInfo')
|
||||||
@ -82,7 +85,7 @@ const CourierServiceInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -90,7 +93,7 @@ const CourierServiceInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -75,7 +75,7 @@ const CourierInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -83,7 +83,7 @@ const CourierInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -193,7 +193,9 @@ const CourierInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='courierService'
|
type='courierService'
|
||||||
masterFilter={{ courier: getModelByName('courier').prefix + ':' + courierId }}
|
masterFilter={{
|
||||||
|
courier: getModelByName('courier').prefix + ':' + courierId
|
||||||
|
}}
|
||||||
visibleColumns={{
|
visibleColumns={{
|
||||||
courier: false
|
courier: false
|
||||||
}}
|
}}
|
||||||
@ -231,10 +233,7 @@ const CourierInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('courier').prefix + ':' + courierId
|
||||||
getModelByName('courier').prefix +
|
|
||||||
':' +
|
|
||||||
courierId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -87,7 +87,7 @@ const DocumentJobInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -216,9 +216,7 @@ const DocumentJobInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('documentJob').prefix +
|
getModelByName('documentJob').prefix + ':' + documentJobId
|
||||||
':' +
|
|
||||||
documentJobId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -91,6 +91,7 @@ const DocumentPrinterInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -87,7 +87,7 @@ const DocumentSizeInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -97,6 +97,7 @@ const DocumentTemplateInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -88,7 +88,7 @@ const EmailAccountInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -23,7 +23,10 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import { getModelByName, getModelProperty } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelByName,
|
||||||
|
getModelProperty
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
import TemplatePreview from '../../common/TemplatePreview.jsx'
|
import TemplatePreview from '../../common/TemplatePreview.jsx'
|
||||||
|
|
||||||
@ -74,7 +77,7 @@ const EmailMessageInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -25,7 +25,10 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import { getModelByName, getModelProperty } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelByName,
|
||||||
|
getModelProperty
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('EmailTemplateInfo')
|
const log = loglevel.getLogger('EmailTemplateInfo')
|
||||||
@ -92,7 +95,7 @@ const EmailTemplateInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -74,7 +74,7 @@ const FilamentSkuInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -82,7 +82,7 @@ const FilamentSkuInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -210,9 +210,7 @@ const FilamentSkuInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('filamentSku').prefix +
|
getModelByName('filamentSku').prefix + ':' + filamentSkuId
|
||||||
':' +
|
|
||||||
filamentSkuId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -92,7 +92,7 @@ const FilamentInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -101,6 +101,7 @@ const FilamentInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -220,7 +221,9 @@ const FilamentInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
ref={filamentSkusTableRef}
|
ref={filamentSkusTableRef}
|
||||||
type='filamentSku'
|
type='filamentSku'
|
||||||
masterFilter={{ filament: getModelByName('filament').prefix + ':' + filamentId }}
|
masterFilter={{
|
||||||
|
filament: getModelByName('filament').prefix + ':' + filamentId
|
||||||
|
}}
|
||||||
visibleColumns={{ filament: false }}
|
visibleColumns={{ filament: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -238,7 +241,9 @@ const FilamentInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='filamentStock'
|
type='filamentStock'
|
||||||
masterFilter={{ filament: getModelByName('filament').prefix + ':' + filamentId }}
|
masterFilter={{
|
||||||
|
filament: getModelByName('filament').prefix + ':' + filamentId
|
||||||
|
}}
|
||||||
visibleColumns={{
|
visibleColumns={{
|
||||||
filament: false,
|
filament: false,
|
||||||
startingWeight: false
|
startingWeight: false
|
||||||
@ -277,10 +282,7 @@ const FilamentInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('filament').prefix + ':' + filamentId
|
||||||
getModelByName('filament').prefix +
|
|
||||||
':' +
|
|
||||||
filamentId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -98,7 +98,7 @@ const FileInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -87,7 +87,7 @@ const HostInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current.handleUpdate()
|
objectFormRef?.current.handleUpdate()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -96,6 +96,7 @@ const HostInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -213,7 +214,9 @@ const HostInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='printer'
|
type='printer'
|
||||||
masterFilter={{ host: getModelByName('host').prefix + ':' + hostId }}
|
masterFilter={{
|
||||||
|
host: getModelByName('host').prefix + ':' + hostId
|
||||||
|
}}
|
||||||
visibleColumns={{
|
visibleColumns={{
|
||||||
host: false
|
host: false
|
||||||
}}
|
}}
|
||||||
@ -234,7 +237,9 @@ const HostInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='documentPrinter'
|
type='documentPrinter'
|
||||||
masterFilter={{ host: getModelByName('host').prefix + ':' + hostId }}
|
masterFilter={{
|
||||||
|
host: getModelByName('host').prefix + ':' + hostId
|
||||||
|
}}
|
||||||
visibleColumns={{
|
visibleColumns={{
|
||||||
host: false
|
host: false
|
||||||
}}
|
}}
|
||||||
@ -272,10 +277,7 @@ const HostInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('host').prefix + ':' + hostId
|
||||||
getModelByName('host').prefix +
|
|
||||||
':' +
|
|
||||||
hostId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -77,7 +77,7 @@ const MaterialInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -85,7 +85,7 @@ const MaterialInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -212,10 +212,7 @@ const MaterialInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('material').prefix + ':' + materialId
|
||||||
getModelByName('material').prefix +
|
|
||||||
':' +
|
|
||||||
materialId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -77,7 +77,7 @@ const NoteTypeInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -188,10 +188,7 @@ const NoteTypeInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('noteType').prefix + ':' + noteTypeId
|
||||||
getModelByName('noteType').prefix +
|
|
||||||
':' +
|
|
||||||
noteTypeId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -27,7 +27,10 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
|
|
||||||
const log = loglevel.getLogger('NoteInfo')
|
const log = loglevel.getLogger('NoteInfo')
|
||||||
log.setLevel(config.logLevel)
|
log.setLevel(config.logLevel)
|
||||||
@ -83,7 +86,7 @@ const NoteInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -91,7 +94,7 @@ const NoteInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -245,10 +248,7 @@ const NoteInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('note').prefix + ':' + noteId
|
||||||
getModelByName('note').prefix +
|
|
||||||
':' +
|
|
||||||
noteId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -69,7 +69,7 @@ const PartSkuInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -77,7 +77,7 @@ const PartSkuInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -204,10 +204,7 @@ const PartSkuInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('partSku').prefix + ':' + partSkuId
|
||||||
getModelByName('partSku').prefix +
|
|
||||||
':' +
|
|
||||||
partSkuId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -88,7 +88,7 @@ const PartInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -197,7 +197,9 @@ const PartInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
ref={partSkusTableRef}
|
ref={partSkusTableRef}
|
||||||
type='partSku'
|
type='partSku'
|
||||||
masterFilter={{ part: getModelByName('part').prefix + ':' + partId }}
|
masterFilter={{
|
||||||
|
part: getModelByName('part').prefix + ':' + partId
|
||||||
|
}}
|
||||||
visibleColumns={{ part: false }}
|
visibleColumns={{ part: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -232,10 +234,7 @@ const PartInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('part').prefix + ':' + partId
|
||||||
getModelByName('part').prefix +
|
|
||||||
':' +
|
|
||||||
partId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -80,7 +80,7 @@ const PermissionSettingInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -88,7 +88,7 @@ const PermissionSettingInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -23,7 +23,10 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const ProductCategoryInfo = () => {
|
const ProductCategoryInfo = () => {
|
||||||
@ -77,7 +80,7 @@ const ProductCategoryInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -85,7 +88,7 @@ const ProductCategoryInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -23,7 +23,10 @@ import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
|||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import PartIcon from '../../../Icons/PartIcon.jsx'
|
import PartIcon from '../../../Icons/PartIcon.jsx'
|
||||||
|
|
||||||
const ProductSkuInfo = () => {
|
const ProductSkuInfo = () => {
|
||||||
@ -75,7 +78,7 @@ const ProductSkuInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -83,7 +86,7 @@ const ProductSkuInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -237,9 +240,7 @@ const ProductSkuInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('productSku').prefix +
|
getModelByName('productSku').prefix + ':' + productSkuId
|
||||||
':' +
|
|
||||||
productSkuId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -88,7 +88,7 @@ const ProductInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -200,7 +200,10 @@ const ProductInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
ref={productSkusTableRef}
|
ref={productSkusTableRef}
|
||||||
type='productSku'
|
type='productSku'
|
||||||
masterFilter={{ product: getModelByName('product').prefix + ':' + productId }}
|
masterFilter={{
|
||||||
|
product:
|
||||||
|
getModelByName('product').prefix + ':' + productId
|
||||||
|
}}
|
||||||
visibleColumns={{ product: false }}
|
visibleColumns={{ product: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -239,10 +242,7 @@ const ProductInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('product').prefix + ':' + productId
|
||||||
getModelByName('product').prefix +
|
|
||||||
':' +
|
|
||||||
productId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -22,7 +22,10 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const StockAuditLevelInfo = () => {
|
const StockAuditLevelInfo = () => {
|
||||||
@ -82,7 +85,7 @@ const StockAuditLevelInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -232,9 +235,7 @@ const StockAuditLevelInfo = () => {
|
|||||||
title='Audit Logs'
|
title='Audit Logs'
|
||||||
icon={<AuditLogIcon />}
|
icon={<AuditLogIcon />}
|
||||||
active={collapseState.auditLogs}
|
active={collapseState.auditLogs}
|
||||||
onToggle={(expanded) =>
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
collapseKey='auditLogs'
|
||||||
>
|
>
|
||||||
{objectFormState.loading ? (
|
{objectFormState.loading ? (
|
||||||
|
|||||||
@ -25,7 +25,10 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('TaxRateInfo')
|
const log = loglevel.getLogger('TaxRateInfo')
|
||||||
@ -77,7 +80,7 @@ const TaxRateInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -85,7 +88,7 @@ const TaxRateInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -236,10 +239,7 @@ const TaxRateInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('taxRate').prefix + ':' + taxRateId
|
||||||
getModelByName('taxRate').prefix +
|
|
||||||
':' +
|
|
||||||
taxRateId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -80,14 +80,14 @@ const UserGroupInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -86,7 +86,7 @@ const UserInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -74,7 +74,7 @@ const VendorInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -82,7 +82,7 @@ const VendorInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -209,10 +209,7 @@ const VendorInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('vendor').prefix + ':' + vendorId
|
||||||
getModelByName('vendor').prefix +
|
|
||||||
':' +
|
|
||||||
vendorId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -111,14 +111,14 @@ const FilamentProfileInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef.current?.handleUpdate?.()
|
objectFormRef.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify='space-between'>
|
<Flex justify='space-between'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -25,7 +25,10 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
import InfoActionButtons from '../../common/InfoActionButtons.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels.js'
|
||||||
import PartIcon from '../../../Icons/PartIcon.jsx'
|
import PartIcon from '../../../Icons/PartIcon.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('GCodeFileInfo')
|
const log = loglevel.getLogger('GCodeFileInfo')
|
||||||
@ -91,6 +94,7 @@ const GCodeFileInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -251,9 +255,7 @@ const GCodeFileInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('gcodeFile').prefix +
|
getModelByName('gcodeFile').prefix + ':' + gcodeFileId
|
||||||
':' +
|
|
||||||
gcodeFileId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -97,6 +97,7 @@ const JobInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -242,10 +243,7 @@ const JobInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('job').prefix + ':' + jobId
|
||||||
getModelByName('job').prefix +
|
|
||||||
':' +
|
|
||||||
jobId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -27,7 +27,10 @@ import UserNotifierToggle from '../../common/UserNotifierToggle'
|
|||||||
import ViewButton from '../../common/ViewButton'
|
import ViewButton from '../../common/ViewButton'
|
||||||
import useCollapseState from '../../hooks/useCollapseState'
|
import useCollapseState from '../../hooks/useCollapseState'
|
||||||
import ObjectProperty from '../../common/ObjectProperty'
|
import ObjectProperty from '../../common/ObjectProperty'
|
||||||
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getModelByName
|
||||||
|
} from '../../../../database/ObjectModels'
|
||||||
import GCodeFileIcon from '../../../Icons/GCodeFileIcon'
|
import GCodeFileIcon from '../../../Icons/GCodeFileIcon'
|
||||||
import SettingsIcon from '../../../Icons/SettingsIcon'
|
import SettingsIcon from '../../../Icons/SettingsIcon'
|
||||||
import ExclamationOctagonIcon from '../../../Icons/ExclamationOctagonIcon'
|
import ExclamationOctagonIcon from '../../../Icons/ExclamationOctagonIcon'
|
||||||
@ -89,14 +92,14 @@ const PrinterProfileInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef.current?.handleUpdate?.()
|
objectFormRef.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify='space-between'>
|
<Flex justify='space-between'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -98,6 +98,7 @@ const PrinterInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -223,7 +224,9 @@ const PrinterInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
ref={profilesTableRef}
|
ref={profilesTableRef}
|
||||||
type='printerProfile'
|
type='printerProfile'
|
||||||
masterFilter={{ printer: getModelByName('printer').prefix + ':' + printerId }}
|
masterFilter={{
|
||||||
|
printer: getModelByName('printer').prefix + ':' + printerId
|
||||||
|
}}
|
||||||
visibleColumns={{
|
visibleColumns={{
|
||||||
printer: false,
|
printer: false,
|
||||||
'printer._id': false
|
'printer._id': false
|
||||||
@ -262,10 +265,7 @@ const PrinterInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('printer').prefix + ':' + printerId
|
||||||
getModelByName('printer').prefix +
|
|
||||||
':' +
|
|
||||||
printerId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -77,7 +77,7 @@ const SubJobInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -183,7 +183,9 @@ const SubJobInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='stockEvent'
|
type='stockEvent'
|
||||||
masterFilter={{ owner: getModelByName('subJob').prefix + ':' + subJobId }}
|
masterFilter={{
|
||||||
|
owner: getModelByName('subJob').prefix + ':' + subJobId
|
||||||
|
}}
|
||||||
visibleColumns={{
|
visibleColumns={{
|
||||||
owner: false,
|
owner: false,
|
||||||
'owner.type': false
|
'owner.type': false
|
||||||
@ -222,10 +224,7 @@ const SubJobInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('subJob').prefix + ':' + subJobId
|
||||||
getModelByName('subJob').prefix +
|
|
||||||
':' +
|
|
||||||
subJobId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -74,7 +74,7 @@ const ClientInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -82,7 +82,7 @@ const ClientInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
@ -209,10 +209,7 @@ const ClientInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent: getModelByName('client').prefix + ':' + clientId
|
||||||
getModelByName('client').prefix +
|
|
||||||
':' +
|
|
||||||
clientId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -93,7 +93,7 @@ const FulfillmentPolicyInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -96,14 +96,14 @@ const ListingVarientInfo = () => {
|
|||||||
finishEdit: () => {
|
finishEdit: () => {
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -101,7 +101,7 @@ const ListingInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -162,7 +162,7 @@ const MarketplaceInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -93,7 +93,7 @@ const ReturnPolicyInfo = () => {
|
|||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', height: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
|
|||||||
@ -100,7 +100,7 @@ const SalesOrderInfo = () => {
|
|||||||
orderItemsTableRef?.current?.handleUpdate?.()
|
orderItemsTableRef?.current?.handleUpdate?.()
|
||||||
objectFormRef?.current?.handleUpdate?.()
|
objectFormRef?.current?.handleUpdate?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -109,6 +109,7 @@ const SalesOrderInfo = () => {
|
|||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
|
height: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -228,7 +229,10 @@ const SalesOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='orderItem'
|
type='orderItem'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
order: getModelByName('salesOrder').prefix + ':' + salesOrderId,
|
order:
|
||||||
|
getModelByName('salesOrder').prefix +
|
||||||
|
':' +
|
||||||
|
salesOrderId,
|
||||||
orderType: 'salesOrder'
|
orderType: 'salesOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
@ -247,7 +251,10 @@ const SalesOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='shipment'
|
type='shipment'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
order: getModelByName('salesOrder').prefix + ':' + salesOrderId,
|
order:
|
||||||
|
getModelByName('salesOrder').prefix +
|
||||||
|
':' +
|
||||||
|
salesOrderId,
|
||||||
orderType: 'salesOrder'
|
orderType: 'salesOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
@ -269,7 +276,10 @@ const SalesOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='invoice'
|
type='invoice'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
order: getModelByName('salesOrder').prefix + ':' + salesOrderId,
|
order:
|
||||||
|
getModelByName('salesOrder').prefix +
|
||||||
|
':' +
|
||||||
|
salesOrderId,
|
||||||
orderType: 'salesOrder'
|
orderType: 'salesOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
@ -291,7 +301,10 @@ const SalesOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='stockEvent'
|
type='stockEvent'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
owner: getModelByName('salesOrder').prefix + ':' + salesOrderId
|
owner:
|
||||||
|
getModelByName('salesOrder').prefix +
|
||||||
|
':' +
|
||||||
|
salesOrderId
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -330,9 +343,7 @@ const SalesOrderInfo = () => {
|
|||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
parent:
|
parent:
|
||||||
getModelByName('salesOrder').prefix +
|
getModelByName('salesOrder').prefix + ':' + salesOrderId
|
||||||
':' +
|
|
||||||
salesOrderId
|
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ _id: false, parent: false }}
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -86,19 +86,40 @@ const NAV_BADGE_STYLE = { padding: 0, fontWeight: 600 }
|
|||||||
const NAV_UPDATE_TAG_STYLE = { cursor: 'pointer', margin: '2px 0 0 0' }
|
const NAV_UPDATE_TAG_STYLE = { cursor: 'pointer', margin: '2px 0 0 0' }
|
||||||
const NAV_OVERFLOW_BUTTON_STYLE = { marginBottom: '4px' }
|
const NAV_OVERFLOW_BUTTON_STYLE = { marginBottom: '4px' }
|
||||||
|
|
||||||
|
const NAV_FADE_MS = 200
|
||||||
|
|
||||||
const navigationFadeClass = (visible) =>
|
const navigationFadeClass = (visible) =>
|
||||||
`dashboard-navigation-fade${visible ? '' : ' dashboard-navigation-fade-hidden'}`
|
`dashboard-navigation-fade${visible ? '' : ' dashboard-navigation-fade-hidden'}`
|
||||||
|
|
||||||
|
const useDelayedInactive = (visible) => {
|
||||||
|
const [inactive, setInactive] = useState(!visible)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (visible) {
|
||||||
|
setInactive(false)
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
const timeoutId = window.setTimeout(() => setInactive(true), NAV_FADE_MS)
|
||||||
|
return () => window.clearTimeout(timeoutId)
|
||||||
|
}, [visible])
|
||||||
|
|
||||||
|
return inactive
|
||||||
|
}
|
||||||
|
|
||||||
const NavigationFade = memo(function NavigationFade({
|
const NavigationFade = memo(function NavigationFade({
|
||||||
visible,
|
visible,
|
||||||
children,
|
children,
|
||||||
style
|
style,
|
||||||
|
className
|
||||||
}) {
|
}) {
|
||||||
|
const inactive = useDelayedInactive(visible)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={navigationFadeClass(visible)}
|
className={classNames(navigationFadeClass(visible), className)}
|
||||||
inert={visible ? undefined : true}
|
inert={inactive ? true : undefined}
|
||||||
aria-hidden={visible ? undefined : true}
|
aria-hidden={inactive ? true : undefined}
|
||||||
style={style}
|
style={style}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
@ -109,7 +130,8 @@ const NavigationFade = memo(function NavigationFade({
|
|||||||
NavigationFade.propTypes = {
|
NavigationFade.propTypes = {
|
||||||
visible: PropTypes.bool,
|
visible: PropTypes.bool,
|
||||||
children: PropTypes.node,
|
children: PropTypes.node,
|
||||||
style: PropTypes.object
|
style: PropTypes.object,
|
||||||
|
className: PropTypes.string
|
||||||
}
|
}
|
||||||
|
|
||||||
const DashboardNavigationTrailingItems = memo(
|
const DashboardNavigationTrailingItems = memo(
|
||||||
@ -246,13 +268,17 @@ DashboardElectronCenterItems.propTypes = {
|
|||||||
const DashboardNavigationTrailing = memo(function DashboardNavigationTrailing({
|
const DashboardNavigationTrailing = memo(function DashboardNavigationTrailing({
|
||||||
showControls,
|
showControls,
|
||||||
isOtherApp,
|
isOtherApp,
|
||||||
|
isElectron,
|
||||||
...itemProps
|
...itemProps
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className='electrobun-webkit-app-region-no-drag'>
|
<div className='electrobun-webkit-app-region-no-drag'>
|
||||||
<NavigationFade visible={showControls}>
|
<NavigationFade visible={!isElectron || showControls}>
|
||||||
<DashboardNavigationTrailingItems {...itemProps} />
|
<DashboardNavigationTrailingItems
|
||||||
|
isElectron={isElectron}
|
||||||
|
{...itemProps}
|
||||||
|
/>
|
||||||
</NavigationFade>
|
</NavigationFade>
|
||||||
</div>
|
</div>
|
||||||
{isOtherApp ? <DashboardWindowButtons /> : null}
|
{isOtherApp ? <DashboardWindowButtons /> : null}
|
||||||
@ -470,6 +496,11 @@ const DashboardNavigation = () => {
|
|||||||
const showMobileLogo = !isElectron && isMobile
|
const showMobileLogo = !isElectron && isMobile
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (!isElectron) {
|
||||||
|
setAnyModalVisible(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
const isModalWrapVisible = (node) => {
|
const isModalWrapVisible = (node) => {
|
||||||
if (!(node instanceof Element)) return false
|
if (!(node instanceof Element)) return false
|
||||||
if (node.getAttribute('aria-hidden') === 'true') return false
|
if (node.getAttribute('aria-hidden') === 'true') return false
|
||||||
@ -508,7 +539,7 @@ const DashboardNavigation = () => {
|
|||||||
observer.disconnect()
|
observer.disconnect()
|
||||||
if (frameId) window.cancelAnimationFrame(frameId)
|
if (frameId) window.cancelAnimationFrame(frameId)
|
||||||
}
|
}
|
||||||
}, [])
|
}, [isElectron])
|
||||||
|
|
||||||
const controlsReady = !isElectron || authenticated
|
const controlsReady = !isElectron || authenticated
|
||||||
const showControls = controlsReady && !anyModalVisible
|
const showControls = controlsReady && !anyModalVisible
|
||||||
@ -618,16 +649,15 @@ const DashboardNavigation = () => {
|
|||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const showWindowTitle = isElectron && !showControls
|
||||||
|
|
||||||
const windowTitle = (
|
const windowTitle = (
|
||||||
<div
|
<NavigationFade
|
||||||
className={`dashboard-navigation-window-title ${navigationFadeClass(
|
visible={showWindowTitle}
|
||||||
!showControls
|
className='dashboard-navigation-window-title'
|
||||||
)}`}
|
|
||||||
aria-hidden={showControls}
|
|
||||||
inert={showControls ? true : undefined}
|
|
||||||
>
|
>
|
||||||
<Text type='secondary'>Farm Control</Text>
|
<Text type='secondary'>Farm Control</Text>
|
||||||
</div>
|
</NavigationFade>
|
||||||
)
|
)
|
||||||
|
|
||||||
const navigationCenterBorder = (
|
const navigationCenterBorder = (
|
||||||
@ -644,12 +674,11 @@ const DashboardNavigation = () => {
|
|||||||
{navigationLeading}
|
{navigationLeading}
|
||||||
<div className='dashboard-navigation-center'>
|
<div className='dashboard-navigation-center'>
|
||||||
{!isMobile ? (
|
{!isMobile ? (
|
||||||
<NavigationFade visible={showControls} style={NAV_CENTER_FADE_STYLE}>
|
<NavigationFade visible style={NAV_CENTER_FADE_STYLE}>
|
||||||
{menu}
|
{menu}
|
||||||
</NavigationFade>
|
</NavigationFade>
|
||||||
) : null}
|
) : null}
|
||||||
{windowTitle}
|
{windowTitle}
|
||||||
{navigationCenterBorder}
|
|
||||||
</div>
|
</div>
|
||||||
{navigationTrailing}
|
{navigationTrailing}
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user