Compare commits
3 Commits
93bd485ae3
...
f2ccec483f
| Author | SHA1 | Date | |
|---|---|---|---|
| f2ccec483f | |||
| ee038d08c3 | |||
| d8c13426d1 |
@ -330,6 +330,28 @@ code {
|
|||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.iddisplay > *:first-child {
|
||||||
|
min-width: 0;
|
||||||
|
flex: 0 1 auto;
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.iddisplay .ant-btn {
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.miscid > *:first-child {
|
||||||
|
min-width: 0;
|
||||||
|
flex: 0 1 auto;
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.miscid .ant-btn {
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.ant-popover-inner:has(.spotlight-tooltip) {
|
.ant-popover-inner:has(.spotlight-tooltip) {
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
}
|
}
|
||||||
@ -1139,3 +1161,150 @@ span.ant-skeleton-input.ant-skeleton-input-sm.text-skeleton {
|
|||||||
.filter-sidebar-field-select .ant-select-selector {
|
.filter-sidebar-field-select .ant-select-selector {
|
||||||
width: max-content !important;
|
width: max-content !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.elipsis-text-wrapper.ant-typography {
|
||||||
|
display: block;
|
||||||
|
min-width: 0;
|
||||||
|
max-width: 100%;
|
||||||
|
width: auto;
|
||||||
|
overflow: hidden;
|
||||||
|
flex-grow: 0;
|
||||||
|
flex-shrink: 1;
|
||||||
|
flex-basis: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-wrapper.ant-typography .elipsis-text {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: baseline;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-wrapper.ant-typography code.elipsis-text-measure,
|
||||||
|
.elipsis-text-wrapper.ant-typography code.elipsis-text-full,
|
||||||
|
.elipsis-text-wrapper.ant-typography code.elipsis-text-truncated {
|
||||||
|
margin: 0;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-measure {
|
||||||
|
position: absolute;
|
||||||
|
visibility: hidden;
|
||||||
|
pointer-events: none;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-full {
|
||||||
|
display: none;
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
width: max-content;
|
||||||
|
max-width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text:not(.is-truncated) .elipsis-text-full {
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text.is-truncated .elipsis-text-full {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text:not(.is-truncated) .elipsis-text-truncated .elipsis-text-dots {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text:not(.is-truncated) .elipsis-text-truncated {
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-truncated {
|
||||||
|
display: flex;
|
||||||
|
flex: 1 1 0;
|
||||||
|
align-items: baseline;
|
||||||
|
min-width: 0;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-wrapper.ant-typography code.elipsis-text-truncated {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-start,
|
||||||
|
.elipsis-text-end {
|
||||||
|
flex: 1 1 0;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-start {
|
||||||
|
mask-image: linear-gradient(
|
||||||
|
to right,
|
||||||
|
#000 0%,
|
||||||
|
#000 calc(100% - 0.8em),
|
||||||
|
transparent 100%
|
||||||
|
);
|
||||||
|
-webkit-mask-image: linear-gradient(
|
||||||
|
to right,
|
||||||
|
#000 0%,
|
||||||
|
#000 calc(100% - 0.8em),
|
||||||
|
transparent 100%
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-end {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
mask-image: linear-gradient(
|
||||||
|
to left,
|
||||||
|
#000 0%,
|
||||||
|
#000 calc(100% - 0.8em),
|
||||||
|
transparent 100%
|
||||||
|
);
|
||||||
|
-webkit-mask-image: linear-gradient(
|
||||||
|
to left,
|
||||||
|
#000 0%,
|
||||||
|
#000 calc(100% - 0.8em),
|
||||||
|
transparent 100%
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-end-inner {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
|
|
||||||
|
.elipsis-text-dots {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.code-diff-viewer {
|
||||||
|
height: 70vh;
|
||||||
|
border: 1px solid #85858541;
|
||||||
|
}
|
||||||
|
|
||||||
|
.code-diff-viewer .cm-mergeView {
|
||||||
|
height: 100%;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-label-square {
|
||||||
|
width: 7px;
|
||||||
|
height: 7px;
|
||||||
|
background-color: #85858541;
|
||||||
|
border-radius: 2px;
|
||||||
|
}
|
||||||
|
|||||||
3
bun.lock
3
bun.lock
@ -23,6 +23,7 @@
|
|||||||
"@codemirror/lang-xml": "^6.1.0",
|
"@codemirror/lang-xml": "^6.1.0",
|
||||||
"@codemirror/lang-yaml": "^6.1.2",
|
"@codemirror/lang-yaml": "^6.1.2",
|
||||||
"@codemirror/language": "6.12.1",
|
"@codemirror/language": "6.12.1",
|
||||||
|
"@codemirror/merge": "^6.12.2",
|
||||||
"@codemirror/state": "6.7.1",
|
"@codemirror/state": "6.7.1",
|
||||||
"@codemirror/theme-one-dark": "^6.1.3",
|
"@codemirror/theme-one-dark": "^6.1.3",
|
||||||
"@codemirror/view": "6.39.12",
|
"@codemirror/view": "6.39.12",
|
||||||
@ -238,6 +239,8 @@
|
|||||||
|
|
||||||
"@codemirror/lint": ["@codemirror/lint@6.9.3", "", { "dependencies": { "@codemirror/state": "6.7.1", "@codemirror/view": "6.39.12", "crelt": "1.0.6" } }, "sha512-y3YkYhdnhjDBAe0VIA0c4wVoFOvnp8CnAvfLqi0TqotIv92wIlAAP7HELOpLBsKwjAX6W92rSflA6an/2zBvXw=="],
|
"@codemirror/lint": ["@codemirror/lint@6.9.3", "", { "dependencies": { "@codemirror/state": "6.7.1", "@codemirror/view": "6.39.12", "crelt": "1.0.6" } }, "sha512-y3YkYhdnhjDBAe0VIA0c4wVoFOvnp8CnAvfLqi0TqotIv92wIlAAP7HELOpLBsKwjAX6W92rSflA6an/2zBvXw=="],
|
||||||
|
|
||||||
|
"@codemirror/merge": ["@codemirror/merge@6.12.2", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/highlight": "^1.0.0", "style-mod": "^4.1.0" } }, "sha512-V8JvyAPjHbPupqP7BeMcsdsYCbyPij74jxIbaIJDORI+VZzW44zFmon8bF+oxGWvOKhcRmkiUMXd8MxHr3YA2w=="],
|
||||||
|
|
||||||
"@codemirror/search": ["@codemirror/search@6.6.0", "", { "dependencies": { "@codemirror/state": "6.7.1", "@codemirror/view": "6.39.12", "crelt": "1.0.7" } }, "sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw=="],
|
"@codemirror/search": ["@codemirror/search@6.6.0", "", { "dependencies": { "@codemirror/state": "6.7.1", "@codemirror/view": "6.39.12", "crelt": "1.0.7" } }, "sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw=="],
|
||||||
|
|
||||||
"@codemirror/state": ["@codemirror/state@6.7.1", "", { "dependencies": { "@marijn/find-cluster-break": "1.0.3" } }, "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A=="],
|
"@codemirror/state": ["@codemirror/state@6.7.1", "", { "dependencies": { "@marijn/find-cluster-break": "1.0.3" } }, "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A=="],
|
||||||
|
|||||||
@ -27,6 +27,7 @@
|
|||||||
"@codemirror/lang-xml": "^6.1.0",
|
"@codemirror/lang-xml": "^6.1.0",
|
||||||
"@codemirror/lang-yaml": "^6.1.2",
|
"@codemirror/lang-yaml": "^6.1.2",
|
||||||
"@codemirror/language": "6.12.1",
|
"@codemirror/language": "6.12.1",
|
||||||
|
"@codemirror/merge": "^6.12.2",
|
||||||
"@codemirror/state": "6.7.1",
|
"@codemirror/state": "6.7.1",
|
||||||
"@codemirror/theme-one-dark": "^6.1.3",
|
"@codemirror/theme-one-dark": "^6.1.3",
|
||||||
"@codemirror/view": "6.39.12",
|
"@codemirror/view": "6.39.12",
|
||||||
|
|||||||
14
pnpm-lock.yaml
generated
14
pnpm-lock.yaml
generated
@ -70,6 +70,9 @@ importers:
|
|||||||
'@codemirror/language':
|
'@codemirror/language':
|
||||||
specifier: 6.12.1
|
specifier: 6.12.1
|
||||||
version: 6.12.1
|
version: 6.12.1
|
||||||
|
'@codemirror/merge':
|
||||||
|
specifier: ^6.12.2
|
||||||
|
version: 6.12.2
|
||||||
'@codemirror/state':
|
'@codemirror/state':
|
||||||
specifier: 6.7.1
|
specifier: 6.7.1
|
||||||
version: 6.7.1
|
version: 6.7.1
|
||||||
@ -611,6 +614,9 @@ packages:
|
|||||||
'@codemirror/lint@6.9.3':
|
'@codemirror/lint@6.9.3':
|
||||||
resolution: {integrity: sha512-y3YkYhdnhjDBAe0VIA0c4wVoFOvnp8CnAvfLqi0TqotIv92wIlAAP7HELOpLBsKwjAX6W92rSflA6an/2zBvXw==}
|
resolution: {integrity: sha512-y3YkYhdnhjDBAe0VIA0c4wVoFOvnp8CnAvfLqi0TqotIv92wIlAAP7HELOpLBsKwjAX6W92rSflA6an/2zBvXw==}
|
||||||
|
|
||||||
|
'@codemirror/merge@6.12.2':
|
||||||
|
resolution: {integrity: sha512-V8JvyAPjHbPupqP7BeMcsdsYCbyPij74jxIbaIJDORI+VZzW44zFmon8bF+oxGWvOKhcRmkiUMXd8MxHr3YA2w==}
|
||||||
|
|
||||||
'@codemirror/search@6.6.0':
|
'@codemirror/search@6.6.0':
|
||||||
resolution: {integrity: sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==}
|
resolution: {integrity: sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==}
|
||||||
|
|
||||||
@ -7047,6 +7053,14 @@ snapshots:
|
|||||||
'@codemirror/view': 6.39.12
|
'@codemirror/view': 6.39.12
|
||||||
crelt: 1.0.6
|
crelt: 1.0.6
|
||||||
|
|
||||||
|
'@codemirror/merge@6.12.2':
|
||||||
|
dependencies:
|
||||||
|
'@codemirror/language': 6.12.1
|
||||||
|
'@codemirror/state': 6.7.1
|
||||||
|
'@codemirror/view': 6.39.12
|
||||||
|
'@lezer/highlight': 1.2.3
|
||||||
|
style-mod: 4.1.3
|
||||||
|
|
||||||
'@codemirror/search@6.6.0':
|
'@codemirror/search@6.6.0':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@codemirror/state': 6.7.1
|
'@codemirror/state': 6.7.1
|
||||||
|
|||||||
@ -26,7 +26,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.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 } 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'
|
||||||
|
|
||||||
@ -38,7 +38,6 @@ const InvoiceInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -82,215 +81,218 @@ const InvoiceInfo = () => {
|
|||||||
delete: () => {
|
delete: () => {
|
||||||
objectFormRef?.current?.handleDelete?.()
|
objectFormRef?.current?.handleDelete?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='invoice'
|
||||||
type='invoice'
|
id={invoiceId}
|
||||||
id={invoiceId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Invoice Information' },
|
||||||
{ key: 'info', label: 'Invoice Information' },
|
{ key: 'invoiceOrderItems', label: 'Invoice Order Items' },
|
||||||
{ key: 'invoiceOrderItems', label: 'Invoice Order Items' },
|
{ key: 'invoiceShipments', label: 'Invoice Shipments' },
|
||||||
{ key: 'invoiceShipments', label: 'Invoice Shipments' },
|
{ key: 'payments', label: 'Payments' },
|
||||||
{ key: 'payments', label: 'Payments' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='invoice'
|
||||||
type='invoice'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='invoice'
|
||||||
type='invoice'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={invoiceId}
|
}
|
||||||
objectType='invoice'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={invoiceId}
|
||||||
|
objectType='invoice'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={invoiceId}
|
|
||||||
type='invoice'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Invoice Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='invoice'
|
|
||||||
labelWidth='225px'
|
|
||||||
objectData={objectData}
|
|
||||||
visibleProperties={{
|
|
||||||
invoiceOrderItems: false,
|
|
||||||
invoiceShipments: false
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Invoice Order Items'
|
|
||||||
icon={<OrderItemIcon />}
|
|
||||||
active={collapseState.invoiceOrderItems}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('invoiceOrderItems', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='invoiceOrderItems'
|
|
||||||
>
|
|
||||||
<ObjectProperty
|
|
||||||
{...getModelProperty('invoice', 'invoiceOrderItems')}
|
|
||||||
isEditing={isEditing}
|
|
||||||
objectData={objectData}
|
|
||||||
loading={loading}
|
|
||||||
size='medium'
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Invoice Shipments'
|
|
||||||
icon={<ShipmentIcon />}
|
|
||||||
active={collapseState.invoiceShipments}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('invoiceShipments', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='invoiceShipments'
|
|
||||||
>
|
|
||||||
<ObjectProperty
|
|
||||||
{...getModelProperty('invoice', 'invoiceShipments')}
|
|
||||||
isEditing={isEditing}
|
|
||||||
objectData={objectData}
|
|
||||||
loading={loading}
|
|
||||||
size='medium'
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Payments'
|
|
||||||
icon={<PaymentIcon />}
|
|
||||||
active={collapseState.payments}
|
|
||||||
onToggle={(expanded) => updateCollapseState('payments', expanded)}
|
|
||||||
collapseKey='payments'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='payment'
|
|
||||||
masterFilter={{ 'invoice._id': invoiceId }}
|
|
||||||
visibleColumns={{ invoice: false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={invoiceId} type='invoice' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': invoiceId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={invoiceId}
|
||||||
|
type='invoice'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Invoice Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='invoice'
|
||||||
|
labelWidth='225px'
|
||||||
|
objectData={objectData}
|
||||||
|
visibleProperties={{
|
||||||
|
invoiceOrderItems: false,
|
||||||
|
invoiceShipments: false
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Invoice Order Items'
|
||||||
|
icon={<OrderItemIcon />}
|
||||||
|
active={collapseState.invoiceOrderItems}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('invoiceOrderItems', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='invoiceOrderItems'
|
||||||
|
>
|
||||||
|
<ObjectProperty
|
||||||
|
{...getModelProperty('invoice', 'invoiceOrderItems')}
|
||||||
|
isEditing={isEditing}
|
||||||
|
objectData={objectData}
|
||||||
|
loading={loading}
|
||||||
|
size='medium'
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Invoice Shipments'
|
||||||
|
icon={<ShipmentIcon />}
|
||||||
|
active={collapseState.invoiceShipments}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('invoiceShipments', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='invoiceShipments'
|
||||||
|
>
|
||||||
|
<ObjectProperty
|
||||||
|
{...getModelProperty('invoice', 'invoiceShipments')}
|
||||||
|
isEditing={isEditing}
|
||||||
|
objectData={objectData}
|
||||||
|
loading={loading}
|
||||||
|
size='medium'
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Payments'
|
||||||
|
icon={<PaymentIcon />}
|
||||||
|
active={collapseState.payments}
|
||||||
|
onToggle={(expanded) => updateCollapseState('payments', expanded)}
|
||||||
|
collapseKey='payments'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='payment'
|
||||||
|
masterFilter={{ invoice: getModelByName('invoice').prefix + ':' + invoiceId }}
|
||||||
|
visibleColumns={{ invoice: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={invoiceId} type='invoice' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('invoice').prefix +
|
||||||
|
':' +
|
||||||
|
invoiceId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -23,6 +23,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('PaymentInfo')
|
const log = loglevel.getLogger('PaymentInfo')
|
||||||
@ -33,7 +34,6 @@ const PaymentInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -74,157 +74,160 @@ const PaymentInfo = () => {
|
|||||||
delete: () => {
|
delete: () => {
|
||||||
objectFormRef?.current?.handleDelete?.()
|
objectFormRef?.current?.handleDelete?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='payment'
|
||||||
type='payment'
|
id={paymentId}
|
||||||
id={paymentId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Payment Information' },
|
||||||
{ key: 'info', label: 'Payment Information' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='payment'
|
||||||
type='payment'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='payment'
|
||||||
type='payment'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={paymentId}
|
}
|
||||||
objectType='payment'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={paymentId}
|
||||||
|
objectType='payment'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={paymentId}
|
|
||||||
type='payment'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Payment Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='payment'
|
|
||||||
labelWidth='225px'
|
|
||||||
objectData={objectData}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={paymentId} type='payment' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': paymentId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={paymentId}
|
||||||
|
type='payment'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Payment Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='payment'
|
||||||
|
labelWidth='225px'
|
||||||
|
objectData={objectData}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={paymentId} type='payment' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('payment').prefix +
|
||||||
|
':' +
|
||||||
|
paymentId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('TaxRecordInfo')
|
const log = loglevel.getLogger('TaxRecordInfo')
|
||||||
@ -199,8 +200,13 @@ const TaxRecordInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': taxRecordId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('taxRecord').prefix +
|
||||||
|
':' +
|
||||||
|
taxRecordId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton'
|
import DocumentPrintButton from '../../common/DocumentPrintButton'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle'
|
import UserNotifierToggle from '../../common/UserNotifierToggle'
|
||||||
import ScrollBox from '../../common/ScrollBox'
|
import ScrollBox from '../../common/ScrollBox'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import HistoryDisplay from '../../common/HistoryDisplay'
|
import HistoryDisplay from '../../common/HistoryDisplay'
|
||||||
|
|
||||||
const FilamentStockInfo = () => {
|
const FilamentStockInfo = () => {
|
||||||
@ -186,7 +187,7 @@ const FilamentStockInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='stockEvent'
|
type='stockEvent'
|
||||||
masterFilter={{ 'parent._id': filamentStockId }}
|
masterFilter={{ parent: getModelByName('filamentStock').prefix + ':' + filamentStockId }}
|
||||||
visibleColumns={{ parent: false }}
|
visibleColumns={{ parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -234,8 +235,13 @@ const FilamentStockInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': filamentStockId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('filamentStock').prefix +
|
||||||
|
':' +
|
||||||
|
filamentStockId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import ObjectActions from '../../common/ObjectActions.jsx'
|
|||||||
import ObjectTable from '../../common/ObjectTable.jsx'
|
import ObjectTable from '../../common/ObjectTable.jsx'
|
||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('OrderItemInfo')
|
const log = loglevel.getLogger('OrderItemInfo')
|
||||||
@ -205,8 +206,13 @@ const OrderItemInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': orderItemId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('orderItem').prefix +
|
||||||
|
':' +
|
||||||
|
orderItemId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -25,6 +25,7 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.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 HistoryDisplay from '../../common/HistoryDisplay.jsx'
|
import HistoryDisplay from '../../common/HistoryDisplay.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import PartStockIcon from '../../../Icons/PartStockIcon.jsx'
|
import PartStockIcon from '../../../Icons/PartStockIcon.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('PartStockInfo')
|
const log = loglevel.getLogger('PartStockInfo')
|
||||||
@ -204,7 +205,7 @@ const PartStockInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='stockEvent'
|
type='stockEvent'
|
||||||
masterFilter={{ 'parent._id': partStockId }}
|
masterFilter={{ parent: getModelByName('partStock').prefix + ':' + partStockId }}
|
||||||
visibleColumns={{ parent: false }}
|
visibleColumns={{ parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -255,8 +256,13 @@ const PartStockInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': partStockId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('partStock').prefix +
|
||||||
|
':' +
|
||||||
|
partStockId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -10,7 +10,7 @@ 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 } 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'
|
||||||
@ -39,7 +39,6 @@ const ProductStockInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -88,217 +87,220 @@ const ProductStockInfo = () => {
|
|||||||
delete: () => {
|
delete: () => {
|
||||||
objectFormRef?.current.handleDelete?.()
|
objectFormRef?.current.handleDelete?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='productStock'
|
||||||
type='productStock'
|
id={productStockId}
|
||||||
id={productStockId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Product Stock Information' },
|
||||||
{ key: 'info', label: 'Product Stock Information' },
|
{ key: 'partStocks', label: 'Part Stocks' },
|
||||||
{ key: 'partStocks', label: 'Part Stocks' },
|
{ key: 'events', label: 'Product Stock Events' },
|
||||||
{ key: 'events', label: 'Product Stock Events' },
|
{ key: 'history', label: 'Product Stock History' },
|
||||||
{ key: 'history', label: 'Product Stock History' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='productStock'
|
||||||
type='productStock'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='productStock'
|
||||||
type='productStock'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={productStockId}
|
}
|
||||||
objectType='productStock'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={productStockId}
|
||||||
|
objectType='productStock'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={productStockId}
|
|
||||||
type='productStock'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Product Stock Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='productStock'
|
|
||||||
objectData={objectData}
|
|
||||||
labelWidth='175px'
|
|
||||||
visibleProperties={{ partStocks: false }}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Part Stocks'
|
|
||||||
icon={<PartStockIcon />}
|
|
||||||
active={collapseState.partStocks}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('partStocks', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='partStocks'
|
|
||||||
>
|
|
||||||
<ObjectProperty
|
|
||||||
{...getModelProperty('productStock', 'partStocks')}
|
|
||||||
isEditing={isEditing}
|
|
||||||
objectData={objectData}
|
|
||||||
loading={loading}
|
|
||||||
size='medium'
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Product Stock Events'
|
|
||||||
icon={<ProductStockIcon />}
|
|
||||||
active={collapseState.events}
|
|
||||||
onToggle={(expanded) => updateCollapseState('events', expanded)}
|
|
||||||
collapseKey='events'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='stockEvent'
|
|
||||||
masterFilter={{ 'parent._id': productStockId }}
|
|
||||||
visibleColumns={{ parent: false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Product Stock History'
|
|
||||||
icon={<GraphIcon />}
|
|
||||||
active={collapseState.history}
|
|
||||||
onToggle={(expanded) => updateCollapseState('history', expanded)}
|
|
||||||
collapseKey='history'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<HistoryDisplay
|
|
||||||
history={objectFormState.objectData?.history || []}
|
|
||||||
objectType='productStock'
|
|
||||||
chartType='line'
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={productStockId} type='productStock' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': productStockId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={productStockId}
|
||||||
|
type='productStock'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Product Stock Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='productStock'
|
||||||
|
objectData={objectData}
|
||||||
|
labelWidth='175px'
|
||||||
|
visibleProperties={{ partStocks: false }}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Part Stocks'
|
||||||
|
icon={<PartStockIcon />}
|
||||||
|
active={collapseState.partStocks}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('partStocks', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='partStocks'
|
||||||
|
>
|
||||||
|
<ObjectProperty
|
||||||
|
{...getModelProperty('productStock', 'partStocks')}
|
||||||
|
isEditing={isEditing}
|
||||||
|
objectData={objectData}
|
||||||
|
loading={loading}
|
||||||
|
size='medium'
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Product Stock Events'
|
||||||
|
icon={<ProductStockIcon />}
|
||||||
|
active={collapseState.events}
|
||||||
|
onToggle={(expanded) => updateCollapseState('events', expanded)}
|
||||||
|
collapseKey='events'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='stockEvent'
|
||||||
|
masterFilter={{ parent: getModelByName('productStock').prefix + ':' + productStockId }}
|
||||||
|
visibleColumns={{ parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Product Stock History'
|
||||||
|
icon={<GraphIcon />}
|
||||||
|
active={collapseState.history}
|
||||||
|
onToggle={(expanded) => updateCollapseState('history', expanded)}
|
||||||
|
collapseKey='history'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<HistoryDisplay
|
||||||
|
history={objectFormState.objectData?.history || []}
|
||||||
|
objectType='productStock'
|
||||||
|
chartType='line'
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={productStockId} type='productStock' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('productStock').prefix +
|
||||||
|
':' +
|
||||||
|
productStockId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -27,6 +27,7 @@ import ScrollBox from '../../common/ScrollBox.jsx'
|
|||||||
import OrderItemsIcon from '../../../Icons/OrderItemIcon.jsx'
|
import OrderItemsIcon from '../../../Icons/OrderItemIcon.jsx'
|
||||||
import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
|
import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
|
||||||
import InvoiceIcon from '../../../Icons/InvoiceIcon.jsx'
|
import InvoiceIcon from '../../../Icons/InvoiceIcon.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
|
import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('PurchaseOrderInfo')
|
const log = loglevel.getLogger('PurchaseOrderInfo')
|
||||||
@ -39,7 +40,6 @@ const PurchaseOrderInfo = () => {
|
|||||||
const shipmentsTableRef = useRef(null)
|
const shipmentsTableRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -92,244 +92,247 @@ const PurchaseOrderInfo = () => {
|
|||||||
delete: () => {
|
delete: () => {
|
||||||
objectFormRef?.current?.handleDelete?.()
|
objectFormRef?.current?.handleDelete?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='purchaseOrder'
|
||||||
type='purchaseOrder'
|
id={purchaseOrderId}
|
||||||
id={purchaseOrderId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Purchase Order Information' },
|
||||||
{ key: 'info', label: 'Purchase Order Information' },
|
{ key: 'orderItems', label: 'Order Items' },
|
||||||
{ key: 'orderItems', label: 'Order Items' },
|
{ key: 'shipments', label: 'Shipments' },
|
||||||
{ key: 'shipments', label: 'Shipments' },
|
{ key: 'invoices', label: 'Invoices' },
|
||||||
{ key: 'invoices', label: 'Invoices' },
|
{ key: 'stockEvents', label: 'Stock Events' },
|
||||||
{ key: 'stockEvents', label: 'Stock Events' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='purchaseOrder'
|
||||||
type='purchaseOrder'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='purchaseOrder'
|
||||||
type='purchaseOrder'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={purchaseOrderId}
|
}
|
||||||
objectType='purchaseOrder'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={purchaseOrderId}
|
||||||
|
objectType='purchaseOrder'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={purchaseOrderId}
|
|
||||||
type='purchaseOrder'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Purchase Order Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='purchaseOrder'
|
|
||||||
labelWidth='225px'
|
|
||||||
objectData={objectData}
|
|
||||||
visibleProperties={{
|
|
||||||
items: false
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Purchase Order Items'
|
|
||||||
icon={<OrderItemsIcon />}
|
|
||||||
active={collapseState.orderItems}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('orderItems', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='orderItems'
|
|
||||||
>
|
|
||||||
<ObjectTable
|
|
||||||
type='orderItem'
|
|
||||||
masterFilter={{
|
|
||||||
'order._id': purchaseOrderId,
|
|
||||||
orderType: 'purchaseOrder'
|
|
||||||
}}
|
|
||||||
visibleColumns={{ order: false }}
|
|
||||||
ref={orderItemsTableRef}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Shipments'
|
|
||||||
icon={<ShipmentIcon />}
|
|
||||||
active={collapseState.shipments}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('shipments', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='shipments'
|
|
||||||
>
|
|
||||||
<ObjectTable
|
|
||||||
type='shipment'
|
|
||||||
masterFilter={{
|
|
||||||
'order._id': purchaseOrderId,
|
|
||||||
orderType: 'purchaseOrder'
|
|
||||||
}}
|
|
||||||
visibleColumns={{ order: false }}
|
|
||||||
ref={shipmentsTableRef}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Invoices'
|
|
||||||
icon={<InvoiceIcon />}
|
|
||||||
active={collapseState.invoices}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('invoices', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='invoices'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='invoice'
|
|
||||||
masterFilter={{
|
|
||||||
'order._id': purchaseOrderId,
|
|
||||||
orderType: 'purchaseOrder'
|
|
||||||
}}
|
|
||||||
visibleColumns={{ order: false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Stock Events'
|
|
||||||
icon={<StockEventIcon />}
|
|
||||||
active={collapseState.stockEvents}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('stockEvents', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='stockEvents'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='stockEvent'
|
|
||||||
masterFilter={{
|
|
||||||
'owner._id': purchaseOrderId
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={purchaseOrderId} type='purchaseOrder' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': purchaseOrderId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={purchaseOrderId}
|
||||||
|
type='purchaseOrder'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Purchase Order Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='purchaseOrder'
|
||||||
|
labelWidth='225px'
|
||||||
|
objectData={objectData}
|
||||||
|
visibleProperties={{
|
||||||
|
items: false
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Purchase Order Items'
|
||||||
|
icon={<OrderItemsIcon />}
|
||||||
|
active={collapseState.orderItems}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('orderItems', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='orderItems'
|
||||||
|
>
|
||||||
|
<ObjectTable
|
||||||
|
type='orderItem'
|
||||||
|
masterFilter={{
|
||||||
|
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
||||||
|
orderType: 'purchaseOrder'
|
||||||
|
}}
|
||||||
|
visibleColumns={{ order: false }}
|
||||||
|
ref={orderItemsTableRef}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Shipments'
|
||||||
|
icon={<ShipmentIcon />}
|
||||||
|
active={collapseState.shipments}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('shipments', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='shipments'
|
||||||
|
>
|
||||||
|
<ObjectTable
|
||||||
|
type='shipment'
|
||||||
|
masterFilter={{
|
||||||
|
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
||||||
|
orderType: 'purchaseOrder'
|
||||||
|
}}
|
||||||
|
visibleColumns={{ order: false }}
|
||||||
|
ref={shipmentsTableRef}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Invoices'
|
||||||
|
icon={<InvoiceIcon />}
|
||||||
|
active={collapseState.invoices}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('invoices', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='invoices'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='invoice'
|
||||||
|
masterFilter={{
|
||||||
|
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
||||||
|
orderType: 'purchaseOrder'
|
||||||
|
}}
|
||||||
|
visibleColumns={{ order: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Stock Events'
|
||||||
|
icon={<StockEventIcon />}
|
||||||
|
active={collapseState.stockEvents}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('stockEvents', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='stockEvents'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='stockEvent'
|
||||||
|
masterFilter={{
|
||||||
|
owner: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={purchaseOrderId} type='purchaseOrder' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('purchaseOrder').prefix +
|
||||||
|
':' +
|
||||||
|
purchaseOrderId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -27,6 +27,7 @@ import NewOrderItem from '../OrderItems/NewOrderItem.jsx'
|
|||||||
import NewShipment from './NewShipment.jsx'
|
import NewShipment from './NewShipment.jsx'
|
||||||
import PostPurchaseOrder from '../PurchaseOrders/PostPurchaseOrder.jsx'
|
import PostPurchaseOrder from '../PurchaseOrders/PostPurchaseOrder.jsx'
|
||||||
import AcknowledgePurchaseOrder from '../PurchaseOrders/AcknowledgePurchaseOrder.jsx'
|
import AcknowledgePurchaseOrder from '../PurchaseOrders/AcknowledgePurchaseOrder.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
|
import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('PurchaseOrderInfo')
|
const log = loglevel.getLogger('PurchaseOrderInfo')
|
||||||
@ -227,7 +228,7 @@ const PurchaseOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='orderItem'
|
type='orderItem'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
'order._id': purchaseOrderId,
|
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
||||||
orderType: 'purchaseOrder'
|
orderType: 'purchaseOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
@ -246,7 +247,7 @@ const PurchaseOrderInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='shipment'
|
type='shipment'
|
||||||
masterFilter={{
|
masterFilter={{
|
||||||
'order._id': purchaseOrderId,
|
order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
|
||||||
orderType: 'purchaseOrder'
|
orderType: 'purchaseOrder'
|
||||||
}}
|
}}
|
||||||
visibleColumns={{ order: false }}
|
visibleColumns={{ order: false }}
|
||||||
@ -282,8 +283,13 @@ const PurchaseOrderInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': purchaseOrderId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('purchaseOrder').prefix +
|
||||||
|
':' +
|
||||||
|
purchaseOrderId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -24,6 +24,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.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 { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import OrderItemIcon from '../../../Icons/OrderItemIcon.jsx'
|
import OrderItemIcon from '../../../Icons/OrderItemIcon.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('ShipmentInfo')
|
const log = loglevel.getLogger('ShipmentInfo')
|
||||||
@ -34,7 +35,6 @@ const ShipmentInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -77,179 +77,182 @@ const ShipmentInfo = () => {
|
|||||||
delete: () => {
|
delete: () => {
|
||||||
objectFormRef?.current?.handleDelete?.()
|
objectFormRef?.current?.handleDelete?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='shipment'
|
||||||
type='shipment'
|
id={shipmentId}
|
||||||
id={shipmentId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Shipment Information' },
|
||||||
{ key: 'info', label: 'Shipment Information' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='shipment'
|
||||||
type='shipment'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='shipment'
|
||||||
type='shipment'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={shipmentId}
|
}
|
||||||
objectType='shipment'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={shipmentId}
|
||||||
|
objectType='shipment'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={shipmentId}
|
|
||||||
type='shipment'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Shipment Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='shipment'
|
|
||||||
objectData={objectData}
|
|
||||||
visibleProperties={{
|
|
||||||
items: false
|
|
||||||
}}
|
|
||||||
labelWidth='175px'
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Shipment Order Items'
|
|
||||||
icon={<OrderItemIcon />}
|
|
||||||
active={collapseState.orderItems}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('orderItems', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='orderItems'
|
|
||||||
>
|
|
||||||
<ObjectTable
|
|
||||||
type='orderItem'
|
|
||||||
masterFilter={{ 'shipment._id': shipmentId }}
|
|
||||||
visibleColumns={{
|
|
||||||
shipment: false,
|
|
||||||
order: false,
|
|
||||||
orderType: false
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={shipmentId} type='shipment' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': shipmentId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={shipmentId}
|
||||||
|
type='shipment'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Shipment Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='shipment'
|
||||||
|
objectData={objectData}
|
||||||
|
visibleProperties={{
|
||||||
|
items: false
|
||||||
|
}}
|
||||||
|
labelWidth='175px'
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Shipment Order Items'
|
||||||
|
icon={<OrderItemIcon />}
|
||||||
|
active={collapseState.orderItems}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('orderItems', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='orderItems'
|
||||||
|
>
|
||||||
|
<ObjectTable
|
||||||
|
type='orderItem'
|
||||||
|
masterFilter={{ shipment: getModelByName('shipment').prefix + ':' + shipmentId }}
|
||||||
|
visibleColumns={{
|
||||||
|
shipment: false,
|
||||||
|
order: false,
|
||||||
|
orderType: false
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={shipmentId} type='shipment' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('shipment').prefix +
|
||||||
|
':' +
|
||||||
|
shipmentId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { 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')
|
||||||
@ -211,8 +212,13 @@ const StockAuditInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': stockAuditId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('stockAudit').prefix +
|
||||||
|
':' +
|
||||||
|
stockAuditId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('StockLocationInfo')
|
const log = loglevel.getLogger('StockLocationInfo')
|
||||||
@ -209,8 +210,13 @@ const StockLocationInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': stockLocationId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('stockLocation').prefix +
|
||||||
|
':' +
|
||||||
|
stockLocationId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -8,7 +8,7 @@ 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 } 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'
|
||||||
@ -31,7 +31,6 @@ const StockTransferInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -78,178 +77,181 @@ const StockTransferInfo = () => {
|
|||||||
delete: () => {
|
delete: () => {
|
||||||
objectFormRef?.current.handleDelete?.()
|
objectFormRef?.current.handleDelete?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='stockTransfer'
|
||||||
type='stockTransfer'
|
id={stockTransferId}
|
||||||
id={stockTransferId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Transfer' },
|
||||||
{ key: 'info', label: 'Transfer' },
|
{ key: 'lines', label: 'Lines' },
|
||||||
{ key: 'lines', label: 'Lines' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='stockTransfer'
|
||||||
type='stockTransfer'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='stockTransfer'
|
||||||
type='stockTransfer'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={stockTransferId}
|
}
|
||||||
objectType='stockTransfer'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={stockTransferId}
|
||||||
|
objectType='stockTransfer'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={stockTransferId}
|
|
||||||
type='stockTransfer'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Stock transfer'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='stockTransfer'
|
|
||||||
objectData={objectData}
|
|
||||||
labelWidth='175px'
|
|
||||||
visibleProperties={{ lines: false }}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Lines'
|
|
||||||
icon={<StockTransferIcon />}
|
|
||||||
active={collapseState.lines}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('lines', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='lines'
|
|
||||||
>
|
|
||||||
<ObjectProperty
|
|
||||||
{...getModelProperty('stockTransfer', 'lines')}
|
|
||||||
isEditing={isEditing}
|
|
||||||
objectData={objectData}
|
|
||||||
loading={loading}
|
|
||||||
size='medium'
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={stockTransferId} type='stockTransfer' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': stockTransferId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={stockTransferId}
|
||||||
|
type='stockTransfer'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Stock transfer'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='stockTransfer'
|
||||||
|
objectData={objectData}
|
||||||
|
labelWidth='175px'
|
||||||
|
visibleProperties={{ lines: false }}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Lines'
|
||||||
|
icon={<StockTransferIcon />}
|
||||||
|
active={collapseState.lines}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('lines', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='lines'
|
||||||
|
>
|
||||||
|
<ObjectProperty
|
||||||
|
{...getModelProperty('stockTransfer', 'lines')}
|
||||||
|
isEditing={isEditing}
|
||||||
|
objectData={objectData}
|
||||||
|
loading={loading}
|
||||||
|
size='medium'
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={stockTransferId} type='stockTransfer' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('stockTransfer').prefix +
|
||||||
|
':' +
|
||||||
|
stockTransferId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -19,6 +19,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const AppPasswordInfo = () => {
|
const AppPasswordInfo = () => {
|
||||||
@ -26,7 +27,6 @@ const AppPasswordInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -70,132 +70,135 @@ const AppPasswordInfo = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='appPassword'
|
||||||
type='appPassword'
|
id={appPasswordId}
|
||||||
id={appPasswordId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'App Password Information' },
|
||||||
{ key: 'info', label: 'App Password Information' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='appPassword'
|
||||||
type='appPassword'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='appPassword'
|
||||||
type='appPassword'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={appPasswordId}
|
}
|
||||||
objectType='appPassword'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={appPasswordId}
|
||||||
<ScrollBox>
|
objectType='appPassword'
|
||||||
<Flex vertical gap={'large'}>
|
showEndingDivider={true}
|
||||||
<ActionHandler
|
/>
|
||||||
actions={actions}
|
</Space>
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<InfoCollapse
|
|
||||||
title='App Password Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={appPasswordId}
|
|
||||||
type='appPassword'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='appPassword'
|
|
||||||
objectData={objectData}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</InfoCollapse>
|
|
||||||
</ActionHandler>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': appPasswordId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<InfoCollapse
|
||||||
|
title='App Password Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={appPasswordId}
|
||||||
|
type='appPassword'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='appPassword'
|
||||||
|
objectData={objectData}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</InfoCollapse>
|
||||||
|
</ActionHandler>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('appPassword').prefix +
|
||||||
|
':' +
|
||||||
|
appPasswordId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import CloudIcon from '../../../Icons/CloudIcon'
|
|||||||
import HostIcon from '../../../Icons/HostIcon'
|
import HostIcon from '../../../Icons/HostIcon'
|
||||||
import ReloadIcon from '../../../Icons/ReloadIcon'
|
import ReloadIcon from '../../../Icons/ReloadIcon'
|
||||||
import HProgress from '../../common/HProgress'
|
import HProgress from '../../common/HProgress'
|
||||||
|
import ElipsisText from '../../common/ElipsisText'
|
||||||
|
|
||||||
import CheckCircleIcon from '../../../Icons/CheckCircleIcon'
|
import CheckCircleIcon from '../../../Icons/CheckCircleIcon'
|
||||||
import XMarkCircleIcon from '../../../Icons/XMarkCircleIcon'
|
import XMarkCircleIcon from '../../../Icons/XMarkCircleIcon'
|
||||||
@ -143,9 +144,9 @@ const UpdateStage = ({ stage, status, percent, detail }) => {
|
|||||||
style={{ flex: 1, margin: 0 }}
|
style={{ flex: 1, margin: 0 }}
|
||||||
/>
|
/>
|
||||||
{detail && (
|
{detail && (
|
||||||
<Text type='secondary' ellipsis style={{ minWidth: 0 }}>
|
<ElipsisText type='secondary' style={{ minWidth: 0 }}>
|
||||||
{detail}
|
{detail}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
)}
|
)}
|
||||||
</Flex>
|
</Flex>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { 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')
|
||||||
@ -201,8 +202,13 @@ const CourierServiceInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': courierServiceId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('courierService').prefix +
|
||||||
|
':' +
|
||||||
|
courierServiceId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.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 { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import CourierServiceIcon from '../../../Icons/CourierServiceIcon.jsx'
|
import CourierServiceIcon from '../../../Icons/CourierServiceIcon.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('CourierInfo')
|
const log = loglevel.getLogger('CourierInfo')
|
||||||
@ -186,10 +187,10 @@ const CourierInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='courierService'
|
type='courierService'
|
||||||
masterFilter={{ 'courier._id': courierId }}
|
masterFilter={{ courier: getModelByName('courier').prefix + ':' + courierId }}
|
||||||
visibleColumns={{
|
visibleColumns={{
|
||||||
courier: false,
|
courier: false,
|
||||||
'courier._id': false
|
courier: false
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -219,8 +220,13 @@ const CourierInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': courierId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('courier').prefix +
|
||||||
|
':' +
|
||||||
|
courierId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('DocumentJobInfo')
|
const log = loglevel.getLogger('DocumentJobInfo')
|
||||||
@ -199,8 +200,13 @@ const DocumentJobInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': documentJobId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('documentJob').prefix +
|
||||||
|
':' +
|
||||||
|
documentJobId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('DocumentPrinterInfo')
|
const log = loglevel.getLogger('DocumentPrinterInfo')
|
||||||
@ -213,8 +214,13 @@ const DocumentPrinterInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': documentPrinterId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('documentPrinter').prefix +
|
||||||
|
':' +
|
||||||
|
documentPrinterId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('DocumentSizeInfo')
|
const log = loglevel.getLogger('DocumentSizeInfo')
|
||||||
@ -200,8 +201,13 @@ const DocumentSizeInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': documentSizeId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('documentSize').prefix +
|
||||||
|
':' +
|
||||||
|
documentSizeId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('DocumentTemplateInfo')
|
const log = loglevel.getLogger('DocumentTemplateInfo')
|
||||||
@ -214,8 +215,13 @@ const DocumentTemplateInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': documentTemplateId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('documentTemplate').prefix +
|
||||||
|
':' +
|
||||||
|
documentTemplateId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -19,6 +19,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const FilamentSkuInfo = () => {
|
const FilamentSkuInfo = () => {
|
||||||
@ -196,8 +197,13 @@ const FilamentSkuInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': filamentSkuId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('filamentSku').prefix +
|
||||||
|
':' +
|
||||||
|
filamentSkuId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -25,6 +25,7 @@ import FilamentIcon from '../../../Icons/FilamentIcon.jsx'
|
|||||||
import FilamentSkuIcon from '../../../Icons/FilamentSkuIcon.jsx'
|
import FilamentSkuIcon from '../../../Icons/FilamentSkuIcon.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('FilamentInfo')
|
const log = loglevel.getLogger('FilamentInfo')
|
||||||
@ -214,7 +215,7 @@ const FilamentInfo = () => {
|
|||||||
<ObjectTable
|
<ObjectTable
|
||||||
ref={filamentSkusTableRef}
|
ref={filamentSkusTableRef}
|
||||||
type='filamentSku'
|
type='filamentSku'
|
||||||
masterFilter={{ filament: filamentId }}
|
masterFilter={{ filament: getModelByName('filament').prefix + ':' + filamentId }}
|
||||||
visibleColumns={{ filament: false }}
|
visibleColumns={{ filament: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -232,7 +233,7 @@ const FilamentInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='filamentStock'
|
type='filamentStock'
|
||||||
masterFilter={{ filament: filamentId }}
|
masterFilter={{ filament: getModelByName('filament').prefix + ':' + filamentId }}
|
||||||
visibleColumns={{
|
visibleColumns={{
|
||||||
filament: false,
|
filament: false,
|
||||||
startingWeight: false
|
startingWeight: false
|
||||||
@ -265,8 +266,13 @@ const FilamentInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': filamentId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('filament').prefix +
|
||||||
|
':' +
|
||||||
|
filamentId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -28,7 +28,7 @@ import { ApiServerContext } from '../../context/ApiServerContext.jsx'
|
|||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
import JsonObjectIcon from '../../../Icons/JsonObjectIcon.jsx'
|
import JsonObjectIcon from '../../../Icons/JsonObjectIcon.jsx'
|
||||||
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
||||||
import { getModelProperty } from '../../../../database/ObjectModels.js'
|
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
|
|
||||||
const log = loglevel.getLogger('FileInfo')
|
const log = loglevel.getLogger('FileInfo')
|
||||||
log.setLevel(config.logLevel)
|
log.setLevel(config.logLevel)
|
||||||
@ -250,8 +250,13 @@ const FileInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': fileId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('file').prefix +
|
||||||
|
':' +
|
||||||
|
fileId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -25,6 +25,7 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
|||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
import PrinterIcon from '../../../Icons/PrinterIcon.jsx'
|
import PrinterIcon from '../../../Icons/PrinterIcon.jsx'
|
||||||
import DocumentPrinterIcon from '../../../Icons/DocumentPrinterIcon.jsx'
|
import DocumentPrinterIcon from '../../../Icons/DocumentPrinterIcon.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('HostInfo')
|
const log = loglevel.getLogger('HostInfo')
|
||||||
@ -35,7 +36,6 @@ const HostInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -81,198 +81,201 @@ const HostInfo = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='host'
|
||||||
type='host'
|
id={hostId}
|
||||||
id={hostId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Host Information' },
|
||||||
{ key: 'info', label: 'Host Information' },
|
{ key: 'printers', label: 'Printers' },
|
||||||
{ key: 'printers', label: 'Printers' },
|
{ key: 'documentPrinters', label: 'Document Printers' },
|
||||||
{ key: 'documentPrinters', label: 'Document Printers' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='host'
|
||||||
type='host'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='host'
|
||||||
type='host'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={hostId}
|
}
|
||||||
objectType='host'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={hostId}
|
||||||
|
objectType='host'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Host Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={hostId}
|
|
||||||
type='host'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => {
|
|
||||||
return (
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='host'
|
|
||||||
objectData={objectData}
|
|
||||||
labelWidth='175px'
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
</ObjectForm>
|
|
||||||
</InfoCollapse>
|
|
||||||
</ActionHandler>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Printers'
|
|
||||||
icon={<PrinterIcon />}
|
|
||||||
active={collapseState.printers}
|
|
||||||
onToggle={(expanded) => updateCollapseState('printers', expanded)}
|
|
||||||
collapseKey='printers'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='printer'
|
|
||||||
masterFilter={{ 'host._id': hostId }}
|
|
||||||
visibleColumns={{
|
|
||||||
host: false,
|
|
||||||
'host._id': false
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</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'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={hostId} type='host' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': hostId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Host Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={hostId}
|
||||||
|
type='host'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => {
|
||||||
|
return (
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='host'
|
||||||
|
objectData={objectData}
|
||||||
|
labelWidth='175px'
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
</ObjectForm>
|
||||||
|
</InfoCollapse>
|
||||||
|
</ActionHandler>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Printers'
|
||||||
|
icon={<PrinterIcon />}
|
||||||
|
active={collapseState.printers}
|
||||||
|
onToggle={(expanded) => updateCollapseState('printers', expanded)}
|
||||||
|
collapseKey='printers'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='printer'
|
||||||
|
masterFilter={{ host: getModelByName('host').prefix + ':' + hostId }}
|
||||||
|
visibleColumns={{
|
||||||
|
host: false,
|
||||||
|
host: false
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</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: getModelByName('host').prefix + ':' + hostId }}
|
||||||
|
visibleColumns={{
|
||||||
|
host: false,
|
||||||
|
host: false
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={hostId} type='host' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('host').prefix +
|
||||||
|
':' +
|
||||||
|
hostId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('MaterialInfo')
|
const log = loglevel.getLogger('MaterialInfo')
|
||||||
@ -199,8 +200,13 @@ const MaterialInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': materialId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('material').prefix +
|
||||||
|
':' +
|
||||||
|
materialId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -18,6 +18,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const NoteTypeInfo = () => {
|
const NoteTypeInfo = () => {
|
||||||
@ -177,8 +178,13 @@ const NoteTypeInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': noteTypeId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('noteType').prefix +
|
||||||
|
':' +
|
||||||
|
noteTypeId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -15,7 +15,7 @@ const NewNote = ({ onOk, defaultValues = {} }) => {
|
|||||||
<ObjectInfo
|
<ObjectInfo
|
||||||
type='note'
|
type='note'
|
||||||
column={1}
|
column={1}
|
||||||
visibleProperties={{ 'parent._id': false }}
|
visibleProperties={{ parent: false }}
|
||||||
bordered={false}
|
bordered={false}
|
||||||
isEditing={true}
|
isEditing={true}
|
||||||
required={true}
|
required={true}
|
||||||
|
|||||||
@ -25,7 +25,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.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 } 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)
|
||||||
@ -228,8 +228,13 @@ const NoteInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': noteId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('note').prefix +
|
||||||
|
':' +
|
||||||
|
noteId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -19,6 +19,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const PartSkuInfo = () => {
|
const PartSkuInfo = () => {
|
||||||
@ -191,8 +192,13 @@ const PartSkuInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': partSkuId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('partSku').prefix +
|
||||||
|
':' +
|
||||||
|
partSkuId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.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 { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import PartSkuIcon from '../../../Icons/PartSkuIcon.jsx'
|
import PartSkuIcon from '../../../Icons/PartSkuIcon.jsx'
|
||||||
|
|
||||||
const PartInfo = () => {
|
const PartInfo = () => {
|
||||||
@ -30,7 +31,6 @@ const PartInfo = () => {
|
|||||||
const partId = new URLSearchParams(location.search).get('partId')
|
const partId = new URLSearchParams(location.search).get('partId')
|
||||||
const partSkusTableRef = useRef()
|
const partSkusTableRef = useRef()
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -70,166 +70,165 @@ const PartInfo = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='part'
|
||||||
type='part'
|
id={partId}
|
||||||
id={partId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Part Information' },
|
||||||
{ key: 'info', label: 'Part Information' },
|
{ key: 'partSkus', label: 'Part SKUs' },
|
||||||
{ key: 'partSkus', label: 'Part SKUs' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='part'
|
||||||
type='part'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='part'
|
||||||
type='part'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
|
<Space>
|
||||||
|
<EditButtons
|
||||||
|
isEditing={objectFormState.isEditing}
|
||||||
|
handleUpdate={() => {
|
||||||
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
|
}}
|
||||||
|
cancelEditing={() => {
|
||||||
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
|
}}
|
||||||
|
startEditing={() => {
|
||||||
|
actionHandlerRef.current.callAction('edit')
|
||||||
|
}}
|
||||||
|
editLoading={objectFormState.editLoading}
|
||||||
|
formValid={objectFormState.formValid}
|
||||||
|
disabled={
|
||||||
|
objectFormState.beingEditedByOther ||
|
||||||
|
objectFormState.loading ||
|
||||||
|
objectFormState.editDisabled
|
||||||
|
}
|
||||||
|
loading={objectFormState.editLoading}
|
||||||
|
/>
|
||||||
|
<ObjectTableNavigationButtons
|
||||||
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
|
_id={partId}
|
||||||
|
objectType='part'
|
||||||
|
showEndingDivider={true}
|
||||||
|
/>
|
||||||
|
</Space>
|
||||||
|
</Flex>
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={partId}
|
||||||
|
type='part'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
}}
|
}}
|
||||||
cancelEditing={() => {
|
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
|
||||||
}}
|
|
||||||
startEditing={() => {
|
|
||||||
actionHandlerRef.current.callAction('edit')
|
|
||||||
}}
|
|
||||||
editLoading={objectFormState.editLoading}
|
|
||||||
formValid={objectFormState.formValid}
|
|
||||||
disabled={
|
|
||||||
objectFormState.beingEditedByOther ||
|
|
||||||
objectFormState.loading ||
|
|
||||||
objectFormState.editDisabled
|
|
||||||
}
|
|
||||||
loading={objectFormState.editLoading}
|
|
||||||
/>
|
|
||||||
<ObjectTableNavigationButtons
|
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
|
||||||
_id={partId}
|
|
||||||
objectType='part'
|
|
||||||
showEndingDivider={true}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
</Flex>
|
|
||||||
<ScrollBox>
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<ActionHandler
|
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
>
|
||||||
<ObjectForm
|
{({ loading, isEditing, objectData }) => (
|
||||||
id={partId}
|
<InfoCollapse
|
||||||
type='part'
|
title='Part Information'
|
||||||
style={{ height: '100%' }}
|
icon={<InfoCircleIcon />}
|
||||||
ref={objectFormRef}
|
active={collapseState.info}
|
||||||
setCurrentObject={true}
|
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
||||||
onStateChange={(state) => {
|
collapseKey='info'
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
>
|
||||||
}}
|
<ObjectInfo
|
||||||
>
|
loading={loading}
|
||||||
{({ loading, isEditing, objectData }) => (
|
isEditing={isEditing}
|
||||||
<InfoCollapse
|
type='part'
|
||||||
title='Part Information'
|
objectData={objectData}
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='part'
|
|
||||||
objectData={objectData}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Part SKUs'
|
|
||||||
icon={<PartSkuIcon />}
|
|
||||||
active={collapseState.partSkus}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('partSkus', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='partSkus'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
ref={partSkusTableRef}
|
|
||||||
type='partSku'
|
|
||||||
masterFilter={{ part: partId }}
|
|
||||||
visibleColumns={{ part: false }}
|
|
||||||
/>
|
/>
|
||||||
)}
|
</InfoCollapse>
|
||||||
</InfoCollapse>
|
)}
|
||||||
</ActionHandler>
|
</ObjectForm>
|
||||||
<InfoCollapse
|
<InfoCollapse
|
||||||
title='Notes'
|
title='Part SKUs'
|
||||||
icon={<NoteIcon />}
|
icon={<PartSkuIcon />}
|
||||||
active={collapseState.notes}
|
active={collapseState.partSkus}
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
onToggle={(expanded) => updateCollapseState('partSkus', expanded)}
|
||||||
collapseKey='notes'
|
collapseKey='partSkus'
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={partId} type='part' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
>
|
||||||
{objectFormState.loading ? (
|
{objectFormState.loading ? (
|
||||||
<InfoCollapsePlaceholder />
|
<InfoCollapsePlaceholder />
|
||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
ref={partSkusTableRef}
|
||||||
masterFilter={{ 'parent._id': partId }}
|
type='partSku'
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
masterFilter={{ part: getModelByName('part').prefix + ':' + partId }}
|
||||||
|
visibleColumns={{ part: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
</Flex>
|
</ActionHandler>
|
||||||
</ScrollBox>
|
<InfoCollapse
|
||||||
</Flex>
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={partId} type='part' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('part').prefix +
|
||||||
|
':' +
|
||||||
|
partId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -19,6 +19,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const ProductCategoryInfo = () => {
|
const ProductCategoryInfo = () => {
|
||||||
@ -196,8 +197,13 @@ const ProductCategoryInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': productCategoryId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('productCategory').prefix +
|
||||||
|
':' +
|
||||||
|
productCategoryId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -21,7 +21,7 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.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 } 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 = () => {
|
||||||
@ -224,8 +224,13 @@ const ProductSkuInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': productSkuId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('productSku').prefix +
|
||||||
|
':' +
|
||||||
|
productSkuId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.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 { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ProductSkuIcon from '../../../Icons/ProductSkuIcon.jsx'
|
import ProductSkuIcon from '../../../Icons/ProductSkuIcon.jsx'
|
||||||
|
|
||||||
const ProductInfo = () => {
|
const ProductInfo = () => {
|
||||||
@ -36,7 +37,6 @@ const ProductInfo = () => {
|
|||||||
})
|
})
|
||||||
const productSkusTableRef = useRef()
|
const productSkusTableRef = useRef()
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -70,169 +70,172 @@ const ProductInfo = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='product'
|
||||||
type='product'
|
id={productId}
|
||||||
id={productId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Product Information' },
|
||||||
{ key: 'info', label: 'Product Information' },
|
{ key: 'productSkus', label: 'Product SKUs' },
|
||||||
{ key: 'productSkus', label: 'Product SKUs' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='product'
|
||||||
type='product'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='product'
|
||||||
type='product'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={productId}
|
}
|
||||||
objectType='product'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={productId}
|
||||||
<ScrollBox>
|
objectType='product'
|
||||||
<Flex vertical gap={'large'}>
|
showEndingDivider={true}
|
||||||
<ActionHandler
|
/>
|
||||||
actions={actions}
|
</Space>
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={productId}
|
|
||||||
type='product'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Product Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='product'
|
|
||||||
objectData={objectData}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Product SKUs'
|
|
||||||
icon={<ProductSkuIcon />}
|
|
||||||
active={collapseState.productSkus}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('productSkus', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='productSkus'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
ref={productSkusTableRef}
|
|
||||||
type='productSku'
|
|
||||||
masterFilter={{ product: productId }}
|
|
||||||
visibleColumns={{ product: false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={productId} type='product' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': productId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={productId}
|
||||||
|
type='product'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Product Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='product'
|
||||||
|
objectData={objectData}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Product SKUs'
|
||||||
|
icon={<ProductSkuIcon />}
|
||||||
|
active={collapseState.productSkus}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('productSkus', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='productSkus'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
ref={productSkusTableRef}
|
||||||
|
type='productSku'
|
||||||
|
masterFilter={{ product: getModelByName('product').prefix + ':' + productId }}
|
||||||
|
visibleColumns={{ product: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={productId} type='product' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('product').prefix +
|
||||||
|
':' +
|
||||||
|
productId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { 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')
|
||||||
@ -196,8 +197,13 @@ const TaxRateInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': taxRateId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('taxRate').prefix +
|
||||||
|
':' +
|
||||||
|
taxRateId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -23,7 +23,7 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.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 } from '../../../../database/ObjectModels.js'
|
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import { useMediaQuery } from 'react-responsive'
|
import { useMediaQuery } from 'react-responsive'
|
||||||
|
|
||||||
const UserInfo = () => {
|
const UserInfo = () => {
|
||||||
@ -206,7 +206,7 @@ const UserInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='appPassword'
|
type='appPassword'
|
||||||
masterFilter={{ user: userId }}
|
masterFilter={{ user: getModelByName('user').prefix + ':' + userId }}
|
||||||
visibleColumns={{ user: false }}
|
visibleColumns={{ user: false }}
|
||||||
ref={appPasswordsTableRef}
|
ref={appPasswordsTableRef}
|
||||||
/>
|
/>
|
||||||
@ -227,9 +227,7 @@ const UserInfo = () => {
|
|||||||
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 ? (
|
||||||
@ -237,8 +235,13 @@ const UserInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': userId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('user').prefix +
|
||||||
|
':' +
|
||||||
|
userId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('VendorInfo')
|
const log = loglevel.getLogger('VendorInfo')
|
||||||
@ -196,8 +197,13 @@ const VendorInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': vendorId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('vendor').prefix +
|
||||||
|
':' +
|
||||||
|
vendorId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -27,6 +27,7 @@ import SettingsIcon from '../../../Icons/SettingsIcon'
|
|||||||
import UserNotifierToggle from '../../common/UserNotifierToggle'
|
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 { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import {
|
import {
|
||||||
FILAMENT_PROFILE_BED_TEMPERATURE_PROPERTIES,
|
FILAMENT_PROFILE_BED_TEMPERATURE_PROPERTIES,
|
||||||
FILAMENT_PROFILE_COMPATIBILITY_PROPERTIES,
|
FILAMENT_PROFILE_COMPATIBILITY_PROPERTIES,
|
||||||
@ -160,7 +161,9 @@ const FilamentProfileInfo = () => {
|
|||||||
<Space>
|
<Space>
|
||||||
<EditButtons
|
<EditButtons
|
||||||
isEditing={objectFormState.isEditing}
|
isEditing={objectFormState.isEditing}
|
||||||
handleUpdate={() => actionHandlerRef.current.callAction('finishEdit')}
|
handleUpdate={() =>
|
||||||
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
|
}
|
||||||
cancelEditing={() =>
|
cancelEditing={() =>
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
}
|
}
|
||||||
@ -533,8 +536,13 @@ const FilamentProfileInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': filamentProfileId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('filamentProfile').prefix +
|
||||||
|
':' +
|
||||||
|
filamentProfileId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -24,7 +24,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.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 } 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')
|
||||||
@ -235,8 +235,13 @@ const GCodeFileInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': gcodeFileId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('gcodeFile').prefix +
|
||||||
|
':' +
|
||||||
|
gcodeFileId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -4,6 +4,7 @@ import WizardView from '../../common/WizardView'
|
|||||||
import { ApiServerContext } from '../../context/ApiServerContext'
|
import { ApiServerContext } from '../../context/ApiServerContext'
|
||||||
import { Descriptions, Flex, Typography } from 'antd'
|
import { Descriptions, Flex, Typography } from 'antd'
|
||||||
import ObjectTable from '../../common/ObjectTable'
|
import ObjectTable from '../../common/ObjectTable'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ObjectProperty from '../../common/ObjectProperty'
|
import ObjectProperty from '../../common/ObjectProperty'
|
||||||
const { Text } = Typography
|
const { Text } = Typography
|
||||||
const DeployJob = ({
|
const DeployJob = ({
|
||||||
@ -26,7 +27,7 @@ const DeployJob = ({
|
|||||||
while (hasMore == true) {
|
while (hasMore == true) {
|
||||||
const subJobsPage = await fetchObjects('subJob', {
|
const subJobsPage = await fetchObjects('subJob', {
|
||||||
page: currentPage,
|
page: currentPage,
|
||||||
filter: { 'job._id': job._id }
|
filter: { job: job._id }
|
||||||
})
|
})
|
||||||
subJobs = [...subJobs, ...subJobsPage.data]
|
subJobs = [...subJobs, ...subJobsPage.data]
|
||||||
if (subJobsPage.data.length >= 25) {
|
if (subJobsPage.data.length >= 25) {
|
||||||
@ -150,7 +151,7 @@ const DeployJob = ({
|
|||||||
printer: false,
|
printer: false,
|
||||||
job: false
|
job: false
|
||||||
}}
|
}}
|
||||||
masterFilter={{ 'job._id': job?._id }}
|
masterFilter={{ job: getModelByName('job').prefix + ':' + job?._id }}
|
||||||
size={'small'}
|
size={'small'}
|
||||||
showActions={!slicerIntegration}
|
showActions={!slicerIntegration}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -24,6 +24,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import JobIcon from '../../../Icons/JobIcon.jsx'
|
import JobIcon from '../../../Icons/JobIcon.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('JobInfo')
|
const log = loglevel.getLogger('JobInfo')
|
||||||
@ -34,7 +35,6 @@ const JobInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -74,169 +74,172 @@ const JobInfo = () => {
|
|||||||
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={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='job'
|
||||||
type='job'
|
id={jobId}
|
||||||
id={jobId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Job Information' },
|
||||||
{ key: 'info', label: 'Job Information' },
|
{ key: 'subJobs', label: 'Sub Jobs' },
|
||||||
{ key: 'subJobs', label: 'Sub Jobs' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='job'
|
||||||
type='job'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='job'
|
||||||
type='job'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={jobId}
|
}
|
||||||
objectType='job'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={jobId}
|
||||||
|
objectType='job'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Job Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={jobId}
|
|
||||||
type='job'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='job'
|
|
||||||
objectData={objectData}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</InfoCollapse>
|
|
||||||
</ActionHandler>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Sub Jobs'
|
|
||||||
icon={<JobIcon />}
|
|
||||||
active={collapseState.subJobs}
|
|
||||||
onToggle={(expanded) => updateCollapseState('subJobs', expanded)}
|
|
||||||
collapseKey='subJobs'
|
|
||||||
>
|
|
||||||
<ObjectTable
|
|
||||||
type='subJob'
|
|
||||||
masterFilter={{ 'job._id': jobId }}
|
|
||||||
visibleColumns={{ 'job._id': false }}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={jobId} type='job' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': jobId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Job Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={jobId}
|
||||||
|
type='job'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='job'
|
||||||
|
objectData={objectData}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</InfoCollapse>
|
||||||
|
</ActionHandler>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Sub Jobs'
|
||||||
|
icon={<JobIcon />}
|
||||||
|
active={collapseState.subJobs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('subJobs', expanded)}
|
||||||
|
collapseKey='subJobs'
|
||||||
|
>
|
||||||
|
<ObjectTable
|
||||||
|
type='subJob'
|
||||||
|
masterFilter={{ job: getModelByName('job').prefix + ':' + jobId }}
|
||||||
|
visibleColumns={{ job: false }}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={jobId} type='job' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('job').prefix +
|
||||||
|
':' +
|
||||||
|
jobId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -26,7 +26,7 @@ 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 } 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'
|
||||||
@ -133,7 +133,9 @@ const PrinterProfileInfo = () => {
|
|||||||
<Space>
|
<Space>
|
||||||
<EditButtons
|
<EditButtons
|
||||||
isEditing={objectFormState.isEditing}
|
isEditing={objectFormState.isEditing}
|
||||||
handleUpdate={() => actionHandlerRef.current.callAction('finishEdit')}
|
handleUpdate={() =>
|
||||||
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
|
}
|
||||||
cancelEditing={() =>
|
cancelEditing={() =>
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
}
|
}
|
||||||
@ -385,8 +387,13 @@ const PrinterProfileInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': printerProfileId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('printerProfile').prefix +
|
||||||
|
':' +
|
||||||
|
printerProfileId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -24,6 +24,7 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.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 PrinterProfileIcon from '../../../Icons/PrinterProfileIcon.jsx'
|
import PrinterProfileIcon from '../../../Icons/PrinterProfileIcon.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx'
|
import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx'
|
||||||
const log = loglevel.getLogger('PrinterInfo')
|
const log = loglevel.getLogger('PrinterInfo')
|
||||||
log.setLevel(config.logLevel)
|
log.setLevel(config.logLevel)
|
||||||
@ -34,7 +35,6 @@ const PrinterInfo = () => {
|
|||||||
const profilesTableRef = useRef(null)
|
const profilesTableRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
const printerId = new URLSearchParams(location.search).get('printerId')
|
const printerId = new URLSearchParams(location.search).get('printerId')
|
||||||
const [collapseState, updateCollapseState] = useCollapseState('PrinterInfo', {
|
const [collapseState, updateCollapseState] = useCollapseState('PrinterInfo', {
|
||||||
@ -75,188 +75,191 @@ const PrinterInfo = () => {
|
|||||||
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={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='printer'
|
||||||
type='printer'
|
id={printerId}
|
||||||
id={printerId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Printer Information' },
|
||||||
{ key: 'info', label: 'Printer Information' },
|
{ key: 'profiles', label: 'Printer Profiles' },
|
||||||
{ key: 'profiles', label: 'Printer Profiles' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='printer'
|
||||||
type='printer'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='printer'
|
||||||
type='printer'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={printerId}
|
}
|
||||||
objectType='printer'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={printerId}
|
||||||
|
objectType='printer'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Printer Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={printerId}
|
|
||||||
type='printer'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='printer'
|
|
||||||
objectData={objectData}
|
|
||||||
labelWidth='175px'
|
|
||||||
visibleProperties={{
|
|
||||||
currentFilamentStock: false,
|
|
||||||
'currentFilamentStock._id': false,
|
|
||||||
currentJob: false,
|
|
||||||
'currentJob._id': false,
|
|
||||||
currentSubJob: false,
|
|
||||||
'currentSubJob._id': false,
|
|
||||||
alerts: false,
|
|
||||||
pendingSlicerUploads: false
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</InfoCollapse>
|
|
||||||
</ActionHandler>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Printer Profiles'
|
|
||||||
icon={<PrinterProfileIcon />}
|
|
||||||
active={collapseState.profiles}
|
|
||||||
onToggle={(expanded) => updateCollapseState('profiles', expanded)}
|
|
||||||
collapseKey='profiles'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
ref={profilesTableRef}
|
|
||||||
type='printerProfile'
|
|
||||||
masterFilter={{ printer: printerId }}
|
|
||||||
visibleColumns={{
|
|
||||||
printer: false,
|
|
||||||
'printer._id': false
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={printerId} type='printer' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': printerId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Printer Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={printerId}
|
||||||
|
type='printer'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='printer'
|
||||||
|
objectData={objectData}
|
||||||
|
labelWidth='175px'
|
||||||
|
visibleProperties={{
|
||||||
|
currentFilamentStock: false,
|
||||||
|
'currentFilamentStock._id': false,
|
||||||
|
currentJob: false,
|
||||||
|
'currentJob._id': false,
|
||||||
|
currentSubJob: false,
|
||||||
|
'currentSubJob._id': false,
|
||||||
|
alerts: false,
|
||||||
|
pendingSlicerUploads: false
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</InfoCollapse>
|
||||||
|
</ActionHandler>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Printer Profiles'
|
||||||
|
icon={<PrinterProfileIcon />}
|
||||||
|
active={collapseState.profiles}
|
||||||
|
onToggle={(expanded) => updateCollapseState('profiles', expanded)}
|
||||||
|
collapseKey='profiles'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
ref={profilesTableRef}
|
||||||
|
type='printerProfile'
|
||||||
|
masterFilter={{ printer: getModelByName('printer').prefix + ':' + printerId }}
|
||||||
|
visibleColumns={{
|
||||||
|
printer: false,
|
||||||
|
'printer._id': false
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={printerId} type='printer' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('printer').prefix +
|
||||||
|
':' +
|
||||||
|
printerId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.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 { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
|
import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
|
||||||
|
|
||||||
const SubJobInfo = () => {
|
const SubJobInfo = () => {
|
||||||
@ -173,9 +174,9 @@ const SubJobInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='stockEvent'
|
type='stockEvent'
|
||||||
masterFilter={{ 'owner._id': subJobId }}
|
masterFilter={{ owner: getModelByName('subJob').prefix + ':' + subJobId }}
|
||||||
visibleColumns={{
|
visibleColumns={{
|
||||||
'owner._id': false,
|
owner: false,
|
||||||
'owner.type': false,
|
'owner.type': false,
|
||||||
owner: false
|
owner: false
|
||||||
}}
|
}}
|
||||||
@ -207,8 +208,13 @@ const SubJobInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': subJobId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('subJob').prefix +
|
||||||
|
':' +
|
||||||
|
subJobId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('ClientInfo')
|
const log = loglevel.getLogger('ClientInfo')
|
||||||
@ -196,8 +197,13 @@ const ClientInfo = () => {
|
|||||||
) : (
|
) : (
|
||||||
<ObjectTable
|
<ObjectTable
|
||||||
type='auditLog'
|
type='auditLog'
|
||||||
masterFilter={{ 'parent._id': clientId }}
|
masterFilter={{
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
parent:
|
||||||
|
getModelByName('client').prefix +
|
||||||
|
':' +
|
||||||
|
clientId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</InfoCollapse>
|
</InfoCollapse>
|
||||||
|
|||||||
@ -23,6 +23,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
|||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.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 { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
|
|
||||||
const log = loglevel.getLogger('ListingVarientInfo')
|
const log = loglevel.getLogger('ListingVarientInfo')
|
||||||
log.setLevel(config.logLevel)
|
log.setLevel(config.logLevel)
|
||||||
@ -32,7 +33,6 @@ const ListingVarientInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -77,151 +77,154 @@ const ListingVarientInfo = () => {
|
|||||||
delete: () => {
|
delete: () => {
|
||||||
objectFormRef?.current?.handleDelete?.()
|
objectFormRef?.current?.handleDelete?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='listingVarient'
|
||||||
type='listingVarient'
|
id={listingVarientId}
|
||||||
id={listingVarientId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Listing Varient Information' },
|
||||||
{ key: 'info', label: 'Listing Varient Information' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='listingVarient'
|
||||||
type='listingVarient'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='listingVarient'
|
||||||
type='listingVarient'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={listingVarientId}
|
}
|
||||||
objectType='listingVarient'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={listingVarientId}
|
||||||
<ScrollBox>
|
objectType='listingVarient'
|
||||||
<Flex vertical gap={'large'}>
|
showEndingDivider={true}
|
||||||
<ActionHandler
|
/>
|
||||||
actions={actions}
|
</Space>
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={listingVarientId}
|
|
||||||
type='listingVarient'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Listing Varient Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='listingVarient'
|
|
||||||
objectData={objectData}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={listingVarientId} type='listingVarient' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': listingVarientId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={listingVarientId}
|
||||||
|
type='listingVarient'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Listing Varient Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='listingVarient'
|
||||||
|
objectData={objectData}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={listingVarientId} type='listingVarient' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('listingVarient').prefix +
|
||||||
|
':' +
|
||||||
|
listingVarientId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -23,6 +23,7 @@ import ObjectTable from '../../common/ObjectTable.jsx'
|
|||||||
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
|
||||||
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
|
||||||
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('ListingInfo')
|
const log = loglevel.getLogger('ListingInfo')
|
||||||
@ -34,7 +35,6 @@ const ListingInfo = () => {
|
|||||||
const listingVarientsTableRef = useRef(null)
|
const listingVarientsTableRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -75,171 +75,174 @@ const ListingInfo = () => {
|
|||||||
delete: () => {
|
delete: () => {
|
||||||
objectFormRef?.current?.handleDelete?.()
|
objectFormRef?.current?.handleDelete?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='listing'
|
||||||
type='listing'
|
id={listingId}
|
||||||
id={listingId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Listing Information' },
|
||||||
{ key: 'info', label: 'Listing Information' },
|
{ key: 'listingVarients', label: 'Listing Varients' },
|
||||||
{ key: 'listingVarients', label: 'Listing Varients' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='listing'
|
||||||
type='listing'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='listing'
|
||||||
type='listing'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={listingId}
|
}
|
||||||
objectType='listing'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={listingId}
|
||||||
<ScrollBox>
|
objectType='listing'
|
||||||
<Flex vertical gap={'large'}>
|
showEndingDivider={true}
|
||||||
<ActionHandler
|
/>
|
||||||
actions={actions}
|
</Space>
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={listingId}
|
|
||||||
type='listing'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Listing Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='listing'
|
|
||||||
labelWidth={165}
|
|
||||||
objectData={objectData}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Listing Varients'
|
|
||||||
icon={<ListingVarientIcon />}
|
|
||||||
active={collapseState.listingVarients}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('listingVarients', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='listingVarients'
|
|
||||||
>
|
|
||||||
<ObjectTable
|
|
||||||
type='listingVarient'
|
|
||||||
masterFilter={{
|
|
||||||
'listing._id': listingId
|
|
||||||
}}
|
|
||||||
visibleColumns={{ listing: false }}
|
|
||||||
ref={listingVarientsTableRef}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={listingId} type='listing' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': listingId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={listingId}
|
||||||
|
type='listing'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Listing Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='listing'
|
||||||
|
labelWidth={165}
|
||||||
|
objectData={objectData}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Listing Varients'
|
||||||
|
icon={<ListingVarientIcon />}
|
||||||
|
active={collapseState.listingVarients}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('listingVarients', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='listingVarients'
|
||||||
|
>
|
||||||
|
<ObjectTable
|
||||||
|
type='listingVarient'
|
||||||
|
masterFilter={{
|
||||||
|
listing: getModelByName('listing').prefix + ':' + listingId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ listing: false }}
|
||||||
|
ref={listingVarientsTableRef}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={listingId} type='listing' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('listing').prefix +
|
||||||
|
':' +
|
||||||
|
listingId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { useContext, useRef, useState , useEffect} from 'react'
|
import { useContext, useRef, useState, useEffect } from 'react'
|
||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
import { Card, Flex, message, Space } from 'antd'
|
import { Card, Flex, message, Space } from 'antd'
|
||||||
import loglevel from 'loglevel'
|
import loglevel from 'loglevel'
|
||||||
@ -25,6 +25,7 @@ import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
|
|||||||
import ScrollBox from '../../common/ScrollBox.jsx'
|
import ScrollBox from '../../common/ScrollBox.jsx'
|
||||||
import { ApiServerContext } from '../../context/ApiServerContext.jsx'
|
import { ApiServerContext } from '../../context/ApiServerContext.jsx'
|
||||||
import { ElectronContext } from '../../context/ElectronContext.jsx'
|
import { ElectronContext } from '../../context/ElectronContext.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import {
|
import {
|
||||||
buildMarketplaceAuthState,
|
buildMarketplaceAuthState,
|
||||||
storeMarketplaceAuthState
|
storeMarketplaceAuthState
|
||||||
@ -38,7 +39,6 @@ const MarketplaceInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -148,144 +148,147 @@ const MarketplaceInfo = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{ maxHeight: '100%', minHeight: 0 }}
|
style={{ maxHeight: '100%', minHeight: 0 }}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='marketplace'
|
||||||
type='marketplace'
|
id={marketplaceId}
|
||||||
id={marketplaceId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Marketplace Information' },
|
||||||
{ key: 'info', label: 'Marketplace Information' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='marketplace'
|
||||||
type='marketplace'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='marketplace'
|
||||||
type='marketplace'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={marketplaceId}
|
}
|
||||||
objectType='marketplace'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={marketplaceId}
|
||||||
<ScrollBox>
|
objectType='marketplace'
|
||||||
<Flex vertical gap={'large'}>
|
showEndingDivider={true}
|
||||||
<ActionHandler
|
/>
|
||||||
actions={actions}
|
</Space>
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Marketplace Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={marketplaceId}
|
|
||||||
type='marketplace'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='marketplace'
|
|
||||||
labelWidth={215}
|
|
||||||
objectData={objectData}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</InfoCollapse>
|
|
||||||
</ActionHandler>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={marketplaceId} type='marketplace' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': marketplaceId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Marketplace Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) => updateCollapseState('info', expanded)}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={marketplaceId}
|
||||||
|
type='marketplace'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='marketplace'
|
||||||
|
labelWidth={215}
|
||||||
|
objectData={objectData}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</InfoCollapse>
|
||||||
|
</ActionHandler>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={marketplaceId} type='marketplace' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('marketplace').prefix +
|
||||||
|
':' +
|
||||||
|
marketplaceId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -27,6 +27,7 @@ import ScrollBox from '../../common/ScrollBox.jsx'
|
|||||||
import OrderItemsIcon from '../../../Icons/OrderItemIcon.jsx'
|
import OrderItemsIcon from '../../../Icons/OrderItemIcon.jsx'
|
||||||
import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
|
import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
|
||||||
import InvoiceIcon from '../../../Icons/InvoiceIcon.jsx'
|
import InvoiceIcon from '../../../Icons/InvoiceIcon.jsx'
|
||||||
|
import { getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
|
import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
|
||||||
|
|
||||||
const log = loglevel.getLogger('SalesOrderInfo')
|
const log = loglevel.getLogger('SalesOrderInfo')
|
||||||
@ -39,7 +40,6 @@ const SalesOrderInfo = () => {
|
|||||||
const shipmentsTableRef = useRef(null)
|
const shipmentsTableRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
|
|
||||||
|
|
||||||
const { setOnModalOk } = useActions()
|
const { setOnModalOk } = useActions()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setOnModalOk(() => () => {
|
setOnModalOk(() => () => {
|
||||||
@ -90,244 +90,247 @@ const SalesOrderInfo = () => {
|
|||||||
delete: () => {
|
delete: () => {
|
||||||
objectFormRef?.current?.handleDelete?.()
|
objectFormRef?.current?.handleDelete?.()
|
||||||
return true
|
return true
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
gap='large'
|
gap='large'
|
||||||
vertical='true'
|
vertical='true'
|
||||||
style={{
|
style={{
|
||||||
maxHeight: '100%',
|
maxHeight: '100%',
|
||||||
minHeight: 0
|
minHeight: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Flex justify={'space-between'}>
|
<Flex justify={'space-between'}>
|
||||||
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<Space size='small'>
|
||||||
<Space size='small'>
|
<ObjectActions
|
||||||
<ObjectActions
|
type='salesOrder'
|
||||||
type='salesOrder'
|
id={salesOrderId}
|
||||||
id={salesOrderId}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
/>
|
||||||
/>
|
<ViewButton
|
||||||
<ViewButton
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
items={[
|
||||||
items={[
|
{ key: 'info', label: 'Sales Order Information' },
|
||||||
{ key: 'info', label: 'Sales Order Information' },
|
{ key: 'orderItems', label: 'Order Items' },
|
||||||
{ key: 'orderItems', label: 'Order Items' },
|
{ key: 'shipments', label: 'Shipments' },
|
||||||
{ key: 'shipments', label: 'Shipments' },
|
{ key: 'invoices', label: 'Invoices' },
|
||||||
{ key: 'invoices', label: 'Invoices' },
|
{ key: 'stockEvents', label: 'Stock Events' },
|
||||||
{ key: 'stockEvents', label: 'Stock Events' },
|
{ key: 'notes', label: 'Notes' },
|
||||||
{ key: 'notes', label: 'Notes' },
|
{ key: 'auditLogs', label: 'Audit Logs' }
|
||||||
{ key: 'auditLogs', label: 'Audit Logs' }
|
]}
|
||||||
]}
|
visibleState={collapseState}
|
||||||
visibleState={collapseState}
|
updateVisibleState={updateCollapseState}
|
||||||
updateVisibleState={updateCollapseState}
|
/>
|
||||||
/>
|
<UserNotifierToggle
|
||||||
<UserNotifierToggle
|
type='salesOrder'
|
||||||
type='salesOrder'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
/>
|
||||||
/>
|
<DocumentPrintButton
|
||||||
<DocumentPrintButton
|
type='salesOrder'
|
||||||
type='salesOrder'
|
objectData={objectFormState.objectData}
|
||||||
objectData={objectFormState.objectData}
|
disabled={objectFormState.loading}
|
||||||
disabled={objectFormState.loading}
|
|
||||||
/>
|
|
||||||
</Space>
|
|
||||||
<ActivityIndicator
|
|
||||||
activities={objectFormState.activities}
|
|
||||||
showStartingDivider={true}
|
|
||||||
/>
|
/>
|
||||||
</Space>
|
</Space>
|
||||||
<Space>
|
<ActivityIndicator
|
||||||
<EditButtons
|
activities={objectFormState.activities}
|
||||||
isEditing={objectFormState.isEditing}
|
showStartingDivider={true}
|
||||||
handleUpdate={() => {
|
/>
|
||||||
actionHandlerRef.current.callAction('finishEdit')
|
</Space>
|
||||||
}}
|
<Space>
|
||||||
cancelEditing={() => {
|
<EditButtons
|
||||||
actionHandlerRef.current.callAction('cancelEdit')
|
isEditing={objectFormState.isEditing}
|
||||||
}}
|
handleUpdate={() => {
|
||||||
startEditing={() => {
|
actionHandlerRef.current.callAction('finishEdit')
|
||||||
actionHandlerRef.current.callAction('edit')
|
}}
|
||||||
}}
|
cancelEditing={() => {
|
||||||
editLoading={objectFormState.editLoading}
|
actionHandlerRef.current.callAction('cancelEdit')
|
||||||
formValid={objectFormState.formValid}
|
}}
|
||||||
disabled={
|
startEditing={() => {
|
||||||
objectFormState.beingEditedByOther ||
|
actionHandlerRef.current.callAction('edit')
|
||||||
objectFormState.loading ||
|
}}
|
||||||
objectFormState.editDisabled
|
editLoading={objectFormState.editLoading}
|
||||||
}
|
formValid={objectFormState.formValid}
|
||||||
loading={objectFormState.editLoading}
|
disabled={
|
||||||
/>
|
objectFormState.beingEditedByOther ||
|
||||||
<ObjectTableNavigationButtons
|
objectFormState.loading ||
|
||||||
disabled={objectFormState.loading || objectFormState.isEditing}
|
objectFormState.editDisabled
|
||||||
_id={salesOrderId}
|
}
|
||||||
objectType='salesOrder'
|
loading={objectFormState.editLoading}
|
||||||
showEndingDivider={true}
|
/>
|
||||||
/>
|
<ObjectTableNavigationButtons
|
||||||
</Space>
|
disabled={objectFormState.loading || objectFormState.isEditing}
|
||||||
</Flex>
|
_id={salesOrderId}
|
||||||
|
objectType='salesOrder'
|
||||||
<ScrollBox>
|
showEndingDivider={true}
|
||||||
<Flex vertical gap={'large'}>
|
/>
|
||||||
<ActionHandler
|
</Space>
|
||||||
actions={actions}
|
|
||||||
loading={objectFormState.loading}
|
|
||||||
ref={actionHandlerRef}
|
|
||||||
>
|
|
||||||
<ObjectForm
|
|
||||||
id={salesOrderId}
|
|
||||||
type='salesOrder'
|
|
||||||
style={{ height: '100%' }}
|
|
||||||
ref={objectFormRef}
|
|
||||||
setCurrentObject={true}
|
|
||||||
onStateChange={(state) => {
|
|
||||||
setEditFormState((prev) => ({ ...prev, ...state }))
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{({ loading, isEditing, objectData }) => (
|
|
||||||
<Flex vertical gap={'large'}>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Sales Order Information'
|
|
||||||
icon={<InfoCircleIcon />}
|
|
||||||
active={collapseState.info}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('info', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='info'
|
|
||||||
>
|
|
||||||
<ObjectInfo
|
|
||||||
loading={loading}
|
|
||||||
indicator={<LoadingOutlined />}
|
|
||||||
isEditing={isEditing}
|
|
||||||
type='salesOrder'
|
|
||||||
labelWidth='225px'
|
|
||||||
objectData={objectData}
|
|
||||||
visibleProperties={{
|
|
||||||
items: false
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Sales Order Items'
|
|
||||||
icon={<OrderItemsIcon />}
|
|
||||||
active={collapseState.orderItems}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('orderItems', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='orderItems'
|
|
||||||
>
|
|
||||||
<ObjectTable
|
|
||||||
type='orderItem'
|
|
||||||
masterFilter={{
|
|
||||||
'order._id': salesOrderId,
|
|
||||||
orderType: 'salesOrder'
|
|
||||||
}}
|
|
||||||
visibleColumns={{ order: false }}
|
|
||||||
ref={orderItemsTableRef}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Shipments'
|
|
||||||
icon={<ShipmentIcon />}
|
|
||||||
active={collapseState.shipments}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('shipments', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='shipments'
|
|
||||||
>
|
|
||||||
<ObjectTable
|
|
||||||
type='shipment'
|
|
||||||
masterFilter={{
|
|
||||||
'order._id': salesOrderId,
|
|
||||||
orderType: 'salesOrder'
|
|
||||||
}}
|
|
||||||
visibleColumns={{ order: false }}
|
|
||||||
ref={shipmentsTableRef}
|
|
||||||
/>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Invoices'
|
|
||||||
icon={<InvoiceIcon />}
|
|
||||||
active={collapseState.invoices}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('invoices', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='invoices'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='invoice'
|
|
||||||
masterFilter={{
|
|
||||||
'order._id': salesOrderId,
|
|
||||||
orderType: 'salesOrder'
|
|
||||||
}}
|
|
||||||
visibleColumns={{ order: false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Stock Events'
|
|
||||||
icon={<StockEventIcon />}
|
|
||||||
active={collapseState.stockEvents}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('stockEvents', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='stockEvents'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='stockEvent'
|
|
||||||
masterFilter={{
|
|
||||||
'owner._id': salesOrderId
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
)}
|
|
||||||
</ObjectForm>
|
|
||||||
</ActionHandler>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Notes'
|
|
||||||
icon={<NoteIcon />}
|
|
||||||
active={collapseState.notes}
|
|
||||||
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
|
||||||
collapseKey='notes'
|
|
||||||
>
|
|
||||||
<Card>
|
|
||||||
<NotesPanel _id={salesOrderId} type='salesOrder' />
|
|
||||||
</Card>
|
|
||||||
</InfoCollapse>
|
|
||||||
<InfoCollapse
|
|
||||||
title='Audit Logs'
|
|
||||||
icon={<AuditLogIcon />}
|
|
||||||
active={collapseState.auditLogs}
|
|
||||||
onToggle={(expanded) =>
|
|
||||||
updateCollapseState('auditLogs', expanded)
|
|
||||||
}
|
|
||||||
collapseKey='auditLogs'
|
|
||||||
>
|
|
||||||
{objectFormState.loading ? (
|
|
||||||
<InfoCollapsePlaceholder />
|
|
||||||
) : (
|
|
||||||
<ObjectTable
|
|
||||||
type='auditLog'
|
|
||||||
masterFilter={{ 'parent._id': salesOrderId }}
|
|
||||||
visibleColumns={{ _id: false, 'parent._id': false }}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</InfoCollapse>
|
|
||||||
</Flex>
|
|
||||||
</ScrollBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
||||||
|
<ScrollBox>
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<ActionHandler
|
||||||
|
actions={actions}
|
||||||
|
loading={objectFormState.loading}
|
||||||
|
ref={actionHandlerRef}
|
||||||
|
>
|
||||||
|
<ObjectForm
|
||||||
|
id={salesOrderId}
|
||||||
|
type='salesOrder'
|
||||||
|
style={{ height: '100%' }}
|
||||||
|
ref={objectFormRef}
|
||||||
|
setCurrentObject={true}
|
||||||
|
onStateChange={(state) => {
|
||||||
|
setEditFormState((prev) => ({ ...prev, ...state }))
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{({ loading, isEditing, objectData }) => (
|
||||||
|
<Flex vertical gap={'large'}>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Sales Order Information'
|
||||||
|
icon={<InfoCircleIcon />}
|
||||||
|
active={collapseState.info}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('info', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='info'
|
||||||
|
>
|
||||||
|
<ObjectInfo
|
||||||
|
loading={loading}
|
||||||
|
indicator={<LoadingOutlined />}
|
||||||
|
isEditing={isEditing}
|
||||||
|
type='salesOrder'
|
||||||
|
labelWidth='225px'
|
||||||
|
objectData={objectData}
|
||||||
|
visibleProperties={{
|
||||||
|
items: false
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Sales Order Items'
|
||||||
|
icon={<OrderItemsIcon />}
|
||||||
|
active={collapseState.orderItems}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('orderItems', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='orderItems'
|
||||||
|
>
|
||||||
|
<ObjectTable
|
||||||
|
type='orderItem'
|
||||||
|
masterFilter={{
|
||||||
|
order: getModelByName('salesOrder').prefix + ':' + salesOrderId,
|
||||||
|
orderType: 'salesOrder'
|
||||||
|
}}
|
||||||
|
visibleColumns={{ order: false }}
|
||||||
|
ref={orderItemsTableRef}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Shipments'
|
||||||
|
icon={<ShipmentIcon />}
|
||||||
|
active={collapseState.shipments}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('shipments', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='shipments'
|
||||||
|
>
|
||||||
|
<ObjectTable
|
||||||
|
type='shipment'
|
||||||
|
masterFilter={{
|
||||||
|
order: getModelByName('salesOrder').prefix + ':' + salesOrderId,
|
||||||
|
orderType: 'salesOrder'
|
||||||
|
}}
|
||||||
|
visibleColumns={{ order: false }}
|
||||||
|
ref={shipmentsTableRef}
|
||||||
|
/>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Invoices'
|
||||||
|
icon={<InvoiceIcon />}
|
||||||
|
active={collapseState.invoices}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('invoices', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='invoices'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='invoice'
|
||||||
|
masterFilter={{
|
||||||
|
order: getModelByName('salesOrder').prefix + ':' + salesOrderId,
|
||||||
|
orderType: 'salesOrder'
|
||||||
|
}}
|
||||||
|
visibleColumns={{ order: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Stock Events'
|
||||||
|
icon={<StockEventIcon />}
|
||||||
|
active={collapseState.stockEvents}
|
||||||
|
onToggle={(expanded) =>
|
||||||
|
updateCollapseState('stockEvents', expanded)
|
||||||
|
}
|
||||||
|
collapseKey='stockEvents'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='stockEvent'
|
||||||
|
masterFilter={{
|
||||||
|
owner: getModelByName('salesOrder').prefix + ':' + salesOrderId
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
|
</ObjectForm>
|
||||||
|
</ActionHandler>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Notes'
|
||||||
|
icon={<NoteIcon />}
|
||||||
|
active={collapseState.notes}
|
||||||
|
onToggle={(expanded) => updateCollapseState('notes', expanded)}
|
||||||
|
collapseKey='notes'
|
||||||
|
>
|
||||||
|
<Card>
|
||||||
|
<NotesPanel _id={salesOrderId} type='salesOrder' />
|
||||||
|
</Card>
|
||||||
|
</InfoCollapse>
|
||||||
|
<InfoCollapse
|
||||||
|
title='Audit Logs'
|
||||||
|
icon={<AuditLogIcon />}
|
||||||
|
active={collapseState.auditLogs}
|
||||||
|
onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
|
||||||
|
collapseKey='auditLogs'
|
||||||
|
>
|
||||||
|
{objectFormState.loading ? (
|
||||||
|
<InfoCollapsePlaceholder />
|
||||||
|
) : (
|
||||||
|
<ObjectTable
|
||||||
|
type='auditLog'
|
||||||
|
masterFilter={{
|
||||||
|
parent:
|
||||||
|
getModelByName('salesOrder').prefix +
|
||||||
|
':' +
|
||||||
|
salesOrderId
|
||||||
|
}}
|
||||||
|
visibleColumns={{ _id: false, parent: false }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</InfoCollapse>
|
||||||
|
</Flex>
|
||||||
|
</ScrollBox>
|
||||||
|
</Flex>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import PropTypes from 'prop-types'
|
|||||||
import { Flex, Typography, Input } from 'antd'
|
import { Flex, Typography, Input } from 'antd'
|
||||||
import CountryDisplay from './CountryDisplay'
|
import CountryDisplay from './CountryDisplay'
|
||||||
import CountrySelect from './CountrySelect'
|
import CountrySelect from './CountrySelect'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
|
|
||||||
const { Text } = Typography
|
const { Text } = Typography
|
||||||
|
|
||||||
@ -50,9 +51,9 @@ const AddressDisplay = ({
|
|||||||
{isCountry ? (
|
{isCountry ? (
|
||||||
<CountryDisplay countryCode={fieldValue} />
|
<CountryDisplay countryCode={fieldValue} />
|
||||||
) : (
|
) : (
|
||||||
<Text ellipsis alt={label}>
|
<ElipsisText alt={label}>
|
||||||
{fieldValue}
|
{fieldValue}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
)}
|
)}
|
||||||
</Flex>
|
</Flex>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -22,6 +22,64 @@ import { Button, Modal, Typography } from 'antd'
|
|||||||
|
|
||||||
const { Link } = Typography
|
const { Link } = Typography
|
||||||
|
|
||||||
|
export function toEditorCode(code, language = 'javascript') {
|
||||||
|
if (code == null) return ''
|
||||||
|
if (typeof code === 'object' && language === 'json') {
|
||||||
|
return JSON.stringify(code, null, 2)
|
||||||
|
}
|
||||||
|
return String(code)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getCodeLanguageExtension(
|
||||||
|
language = 'javascript',
|
||||||
|
autoCompleteObject = null
|
||||||
|
) {
|
||||||
|
const lang = Array.isArray(language) ? language[0] : language
|
||||||
|
|
||||||
|
switch (String(lang || 'javascript').toLowerCase()) {
|
||||||
|
case 'javascript':
|
||||||
|
case 'js':
|
||||||
|
return javascript()
|
||||||
|
case 'python':
|
||||||
|
case 'py':
|
||||||
|
return python()
|
||||||
|
case 'json':
|
||||||
|
return json()
|
||||||
|
case 'xml':
|
||||||
|
return xml()
|
||||||
|
case 'fctemplatelang':
|
||||||
|
case 'ejs':
|
||||||
|
return fcTemplateLang({ autoCompleteObject })
|
||||||
|
case 'html':
|
||||||
|
return html()
|
||||||
|
case 'css':
|
||||||
|
return css()
|
||||||
|
case 'markdown':
|
||||||
|
case 'md':
|
||||||
|
return markdown()
|
||||||
|
case 'sql':
|
||||||
|
return sql()
|
||||||
|
case 'java':
|
||||||
|
return java()
|
||||||
|
case 'cpp':
|
||||||
|
case 'c++':
|
||||||
|
case 'c':
|
||||||
|
return cpp()
|
||||||
|
case 'rust':
|
||||||
|
case 'rs':
|
||||||
|
return rust()
|
||||||
|
case 'go':
|
||||||
|
return go()
|
||||||
|
case 'php':
|
||||||
|
return php()
|
||||||
|
case 'yaml':
|
||||||
|
case 'yml':
|
||||||
|
return yaml()
|
||||||
|
default:
|
||||||
|
return javascript()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export default function CodeBlockEditor({
|
export default function CodeBlockEditor({
|
||||||
code = '',
|
code = '',
|
||||||
language = 'javascript',
|
language = 'javascript',
|
||||||
@ -37,57 +95,12 @@ export default function CodeBlockEditor({
|
|||||||
}) {
|
}) {
|
||||||
const { isDarkMode } = useThemeContext()
|
const { isDarkMode } = useThemeContext()
|
||||||
const [codeMirrorOpen, setCodeMirrorOpen] = useState(false)
|
const [codeMirrorOpen, setCodeMirrorOpen] = useState(false)
|
||||||
var editorCode = code
|
const editorCode = toEditorCode(code, language)
|
||||||
|
|
||||||
if (typeof code == 'object' && language == 'json') {
|
const languageExtension = useMemo(
|
||||||
editorCode = JSON.stringify(code, null, 2)
|
() => getCodeLanguageExtension(language, autoCompleteObject),
|
||||||
}
|
[language, autoCompleteObject]
|
||||||
|
)
|
||||||
// Map language to CodeMirror extension
|
|
||||||
const languageExtension = useMemo(() => {
|
|
||||||
switch (language.toLowerCase()) {
|
|
||||||
case 'javascript':
|
|
||||||
case 'js':
|
|
||||||
return javascript()
|
|
||||||
case 'python':
|
|
||||||
case 'py':
|
|
||||||
return python()
|
|
||||||
case 'json':
|
|
||||||
return json()
|
|
||||||
case 'xml':
|
|
||||||
return xml()
|
|
||||||
case 'fctemplatelang':
|
|
||||||
case 'ejs':
|
|
||||||
return fcTemplateLang({ autoCompleteObject })
|
|
||||||
case 'html':
|
|
||||||
return html()
|
|
||||||
case 'css':
|
|
||||||
return css()
|
|
||||||
case 'markdown':
|
|
||||||
case 'md':
|
|
||||||
return markdown()
|
|
||||||
case 'sql':
|
|
||||||
return sql()
|
|
||||||
case 'java':
|
|
||||||
return java()
|
|
||||||
case 'cpp':
|
|
||||||
case 'c++':
|
|
||||||
case 'c':
|
|
||||||
return cpp()
|
|
||||||
case 'rust':
|
|
||||||
case 'rs':
|
|
||||||
return rust()
|
|
||||||
case 'go':
|
|
||||||
return go()
|
|
||||||
case 'php':
|
|
||||||
return php()
|
|
||||||
case 'yaml':
|
|
||||||
case 'yml':
|
|
||||||
return yaml()
|
|
||||||
default:
|
|
||||||
return javascript() // Default fallback
|
|
||||||
}
|
|
||||||
}, [language, autoCompleteObject])
|
|
||||||
|
|
||||||
const handleOnChange = (value) => {
|
const handleOnChange = (value) => {
|
||||||
if (typeof code == 'object' && language == 'json') {
|
if (typeof code == 'object' && language == 'json') {
|
||||||
|
|||||||
85
src/components/Dashboard/common/CodeDiffViewer.jsx
Normal file
85
src/components/Dashboard/common/CodeDiffViewer.jsx
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
import { useLayoutEffect, useMemo, useRef } from 'react'
|
||||||
|
import PropTypes from 'prop-types'
|
||||||
|
import { MergeView } from '@codemirror/merge'
|
||||||
|
import { EditorState } from '@codemirror/state'
|
||||||
|
import { EditorView } from '@codemirror/view'
|
||||||
|
import { oneDark } from '@codemirror/theme-one-dark'
|
||||||
|
import { basicSetup } from 'codemirror'
|
||||||
|
import { useThemeContext } from '../context/ThemeContext'
|
||||||
|
import {
|
||||||
|
getCodeLanguageExtension,
|
||||||
|
toEditorCode
|
||||||
|
} from './CodeBlockEditor'
|
||||||
|
|
||||||
|
export default function CodeDiffViewer({
|
||||||
|
oldCode = '',
|
||||||
|
newCode = '',
|
||||||
|
language = 'javascript'
|
||||||
|
}) {
|
||||||
|
const { isDarkMode } = useThemeContext()
|
||||||
|
const parentRef = useRef(null)
|
||||||
|
const oldDoc = toEditorCode(oldCode, language)
|
||||||
|
const newDoc = toEditorCode(newCode, language)
|
||||||
|
|
||||||
|
const languageExtension = useMemo(
|
||||||
|
() => getCodeLanguageExtension(language),
|
||||||
|
[language]
|
||||||
|
)
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
if (!parentRef.current) return
|
||||||
|
|
||||||
|
const editorTheme = EditorView.theme({
|
||||||
|
'&': {
|
||||||
|
fontSize: '14px',
|
||||||
|
fontFamily: 'Monaco, Menlo, "Ubuntu Mono", monospace'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
const sharedExtensions = [
|
||||||
|
basicSetup,
|
||||||
|
languageExtension,
|
||||||
|
editorTheme,
|
||||||
|
EditorView.editable.of(false),
|
||||||
|
EditorState.readOnly.of(true),
|
||||||
|
...(isDarkMode ? [oneDark] : [])
|
||||||
|
]
|
||||||
|
|
||||||
|
const view = new MergeView({
|
||||||
|
a: {
|
||||||
|
doc: oldDoc,
|
||||||
|
extensions: sharedExtensions
|
||||||
|
},
|
||||||
|
b: {
|
||||||
|
doc: newDoc,
|
||||||
|
extensions: sharedExtensions
|
||||||
|
},
|
||||||
|
parent: parentRef.current,
|
||||||
|
highlightChanges: true,
|
||||||
|
gutter: true,
|
||||||
|
collapseUnchanged: { margin: 3, minSize: 6 }
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
view.destroy()
|
||||||
|
}
|
||||||
|
}, [oldDoc, newDoc, languageExtension, isDarkMode])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
ref={parentRef}
|
||||||
|
className={
|
||||||
|
isDarkMode ? 'code-diff-viewer is-dark' : 'code-diff-viewer'
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
CodeDiffViewer.propTypes = {
|
||||||
|
oldCode: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
|
||||||
|
newCode: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
|
||||||
|
language: PropTypes.oneOfType([
|
||||||
|
PropTypes.string,
|
||||||
|
PropTypes.arrayOf(PropTypes.string)
|
||||||
|
])
|
||||||
|
}
|
||||||
@ -1,9 +1,8 @@
|
|||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
import { Flex, Typography } from 'antd'
|
import { Flex } from 'antd'
|
||||||
import Flag from './Flag'
|
import Flag from './Flag'
|
||||||
import countries from '../../../database/Countries'
|
import countries from '../../../database/Countries'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
const { Text } = Typography
|
|
||||||
|
|
||||||
const CountryDisplay = ({ countryCode }) => {
|
const CountryDisplay = ({ countryCode }) => {
|
||||||
const country = countries.find((c) => c.code === countryCode)
|
const country = countries.find((c) => c.code === countryCode)
|
||||||
@ -17,7 +16,7 @@ const CountryDisplay = ({ countryCode }) => {
|
|||||||
gap={'small'}
|
gap={'small'}
|
||||||
align='center'
|
align='center'
|
||||||
className='country-display'
|
className='country-display'
|
||||||
style={{ minWidth: 0 }}
|
style={{ minWidth: 0, width: '100%' }}
|
||||||
>
|
>
|
||||||
<Flag
|
<Flag
|
||||||
code={country.code}
|
code={country.code}
|
||||||
@ -25,8 +24,8 @@ const CountryDisplay = ({ countryCode }) => {
|
|||||||
hasBorder={true}
|
hasBorder={true}
|
||||||
borderRadius={5}
|
borderRadius={5}
|
||||||
/>
|
/>
|
||||||
<div style={{ minWidth: 0 }}>
|
<div style={{ minWidth: 0, flex: 1, overflow: 'hidden' }}>
|
||||||
<Text ellipsis>{country.name}</Text>
|
<ElipsisText>{country.name}</ElipsisText>
|
||||||
</div>
|
</div>
|
||||||
</Flex>
|
</Flex>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -1,9 +1,8 @@
|
|||||||
import { Select, Flex, Typography } from 'antd'
|
import { Select, Flex } from 'antd'
|
||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
import Flag from './Flag'
|
import Flag from './Flag'
|
||||||
import countries from '../../../database/Countries'
|
import countries from '../../../database/Countries'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
const { Text } = Typography
|
|
||||||
|
|
||||||
const CountrySelect = ({
|
const CountrySelect = ({
|
||||||
value,
|
value,
|
||||||
@ -30,7 +29,7 @@ const CountrySelect = ({
|
|||||||
label: (
|
label: (
|
||||||
<Flex gap='small' align='center' className='country-display'>
|
<Flex gap='small' align='center' className='country-display'>
|
||||||
<Flag code={country.code} size='small' borderRadius={3} />
|
<Flag code={country.code} size='small' borderRadius={3} />
|
||||||
<Text elipsis>{country.name}</Text>
|
<ElipsisText>{country.name}</ElipsisText>
|
||||||
</Flex>
|
</Flex>
|
||||||
)
|
)
|
||||||
}))}
|
}))}
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import { Header } from 'antd/es/layout/layout'
|
|||||||
import { useMediaQuery } from 'react-responsive'
|
import { useMediaQuery } from 'react-responsive'
|
||||||
import KeyboardShortcut from './KeyboardShortcut'
|
import KeyboardShortcut from './KeyboardShortcut'
|
||||||
import UserProfilePopover from './UserProfilePopover'
|
import UserProfilePopover from './UserProfilePopover'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
|
|
||||||
import FarmControlLogo from '../../Logos/FarmControlLogo'
|
import FarmControlLogo from '../../Logos/FarmControlLogo'
|
||||||
import FarmControlLogoSmall from '../../Logos/FarmControlLogoSmall'
|
import FarmControlLogoSmall from '../../Logos/FarmControlLogoSmall'
|
||||||
@ -194,19 +195,17 @@ const DashboardNavigation = () => {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{selectedMenuItem.icon}
|
{selectedMenuItem.icon}
|
||||||
<Text
|
<ElipsisText
|
||||||
ellipsis
|
|
||||||
style={{
|
style={{
|
||||||
minWidth: 0, // CRUCIAL for flex children
|
minWidth: 0,
|
||||||
maxWidth: '100%', // Responsive
|
maxWidth: '100%',
|
||||||
whiteSpace: 'nowrap',
|
whiteSpace: 'nowrap',
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
textOverflow: 'ellipsis',
|
flex: 1
|
||||||
flex: 1 // Take available space, shrink as needed
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{selectedMenuItem.label}
|
{selectedMenuItem.label}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
</Flex>
|
</Flex>
|
||||||
)}
|
)}
|
||||||
<div style={{ flexGrow: 1 }}>
|
<div style={{ flexGrow: 1 }}>
|
||||||
|
|||||||
116
src/components/Dashboard/common/DiffLabel.jsx
Normal file
116
src/components/Dashboard/common/DiffLabel.jsx
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
import { useMemo, useState } from 'react'
|
||||||
|
import PropTypes from 'prop-types'
|
||||||
|
import { Button, Modal, Typography, theme, Flex } from 'antd'
|
||||||
|
import { presentableDiff } from '@codemirror/merge'
|
||||||
|
import CodeDiffViewer from './CodeDiffViewer'
|
||||||
|
import { toEditorCode } from './CodeBlockEditor'
|
||||||
|
|
||||||
|
const { Link, Text } = Typography
|
||||||
|
|
||||||
|
const SQUARE_COUNT = 10
|
||||||
|
|
||||||
|
const countLines = (str) => {
|
||||||
|
if (!str) return 0
|
||||||
|
const parts = str.split('\n')
|
||||||
|
if (parts[parts.length - 1] === '') parts.pop()
|
||||||
|
return Math.max(parts.length, 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getCodeDiffStats(oldCode, newCode, language = 'javascript') {
|
||||||
|
const oldText = toEditorCode(oldCode, language)
|
||||||
|
const newText = toEditorCode(newCode, language)
|
||||||
|
const changes = presentableDiff(oldText, newText)
|
||||||
|
let additions = 0
|
||||||
|
let deletions = 0
|
||||||
|
|
||||||
|
for (const change of changes) {
|
||||||
|
const deleted = oldText.slice(change.fromA, change.toA)
|
||||||
|
const added = newText.slice(change.fromB, change.toB)
|
||||||
|
if (deleted) deletions += countLines(deleted)
|
||||||
|
if (added) additions += countLines(added)
|
||||||
|
}
|
||||||
|
|
||||||
|
return { additions, deletions }
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function DiffLabel({
|
||||||
|
oldCode = '',
|
||||||
|
newCode = '',
|
||||||
|
language = 'javascript'
|
||||||
|
}) {
|
||||||
|
const { token } = theme.useToken()
|
||||||
|
const [open, setOpen] = useState(false)
|
||||||
|
const [viewerReady, setViewerReady] = useState(false)
|
||||||
|
const { additions, deletions } = useMemo(
|
||||||
|
() => getCodeDiffStats(oldCode, newCode, language),
|
||||||
|
[oldCode, newCode, language]
|
||||||
|
)
|
||||||
|
|
||||||
|
const greenCount = Math.round(
|
||||||
|
(additions / (additions + deletions)) * SQUARE_COUNT
|
||||||
|
)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Link
|
||||||
|
className='diff-label'
|
||||||
|
onClick={() => {
|
||||||
|
setOpen(true)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Flex gap='small' align='center' style={{ marginTop: 0.5 }}>
|
||||||
|
<Text style={{ color: token.colorSuccess }}>+{additions}</Text>
|
||||||
|
<Flex gap='4px' align='center' style={{ marginBottom: 2 }}>
|
||||||
|
{Array.from({ length: SQUARE_COUNT }).map((_, i) => (
|
||||||
|
<div
|
||||||
|
key={i}
|
||||||
|
className='diff-label-square'
|
||||||
|
style={{
|
||||||
|
backgroundColor:
|
||||||
|
i < greenCount ? token.colorSuccess : token.colorError
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</Flex>
|
||||||
|
<Text style={{ color: token.colorError }}>-{deletions}</Text>
|
||||||
|
</Flex>
|
||||||
|
</Link>
|
||||||
|
<Modal
|
||||||
|
closeIcon={false}
|
||||||
|
open={open}
|
||||||
|
width='90%'
|
||||||
|
destroyOnClose
|
||||||
|
afterOpenChange={setViewerReady}
|
||||||
|
onCancel={() => {
|
||||||
|
setOpen(false)
|
||||||
|
}}
|
||||||
|
footer={
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
setOpen(false)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Close
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{viewerReady ? (
|
||||||
|
<CodeDiffViewer
|
||||||
|
oldCode={oldCode}
|
||||||
|
newCode={newCode}
|
||||||
|
language={language}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
</Modal>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
DiffLabel.propTypes = {
|
||||||
|
oldCode: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
|
||||||
|
newCode: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
|
||||||
|
language: PropTypes.oneOfType([
|
||||||
|
PropTypes.string,
|
||||||
|
PropTypes.arrayOf(PropTypes.string)
|
||||||
|
])
|
||||||
|
}
|
||||||
108
src/components/Dashboard/common/ElipsisText.jsx
Normal file
108
src/components/Dashboard/common/ElipsisText.jsx
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
import { useLayoutEffect, useRef, useState } from 'react'
|
||||||
|
import PropTypes from 'prop-types'
|
||||||
|
import { Typography } from 'antd'
|
||||||
|
|
||||||
|
const { Text } = Typography
|
||||||
|
|
||||||
|
const childrenToString = (children) => {
|
||||||
|
if (children == null || typeof children === 'boolean') return ''
|
||||||
|
if (typeof children === 'string' || typeof children === 'number') {
|
||||||
|
return String(children)
|
||||||
|
}
|
||||||
|
if (Array.isArray(children)) {
|
||||||
|
return children.map(childrenToString).join('')
|
||||||
|
}
|
||||||
|
if (typeof children === 'object' && children.props) {
|
||||||
|
return childrenToString(children.props.children)
|
||||||
|
}
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
|
||||||
|
const splitMiddle = (text) => {
|
||||||
|
const mid = Math.ceil(text.length / 2)
|
||||||
|
return {
|
||||||
|
start: text.slice(0, mid),
|
||||||
|
end: text.slice(mid)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const ElipsisText = ({ children, style, className, title, code, ...rest }) => {
|
||||||
|
const text = childrenToString(children)
|
||||||
|
const { start, end } = splitMiddle(text)
|
||||||
|
|
||||||
|
const containerRef = useRef(null)
|
||||||
|
const measureRef = useRef(null)
|
||||||
|
const truncatedRef = useRef(false)
|
||||||
|
const [truncated, setTruncated] = useState(false)
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
const container = containerRef.current
|
||||||
|
const measure = measureRef.current
|
||||||
|
if (!container || !measure) return
|
||||||
|
|
||||||
|
const update = () => {
|
||||||
|
const available = container.getBoundingClientRect().width
|
||||||
|
if (available < 1) return
|
||||||
|
|
||||||
|
const textWidth = measure.getBoundingClientRect().width
|
||||||
|
const next = Boolean(end) && textWidth > available
|
||||||
|
if (truncatedRef.current === next) return
|
||||||
|
truncatedRef.current = next
|
||||||
|
setTruncated(next)
|
||||||
|
}
|
||||||
|
|
||||||
|
update()
|
||||||
|
const frame = requestAnimationFrame(update)
|
||||||
|
|
||||||
|
const resizeObserver = new ResizeObserver(update)
|
||||||
|
resizeObserver.observe(container)
|
||||||
|
|
||||||
|
const intersectionObserver = new IntersectionObserver(update)
|
||||||
|
intersectionObserver.observe(container)
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
cancelAnimationFrame(frame)
|
||||||
|
resizeObserver.disconnect()
|
||||||
|
intersectionObserver.disconnect()
|
||||||
|
}
|
||||||
|
}, [text, end])
|
||||||
|
|
||||||
|
const showTruncated = truncated && Boolean(end)
|
||||||
|
const RootTag = code ? 'code' : 'span'
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Text
|
||||||
|
{...rest}
|
||||||
|
className={['elipsis-text-wrapper', className].filter(Boolean).join(' ')}
|
||||||
|
title={title ?? text}
|
||||||
|
style={style}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
className={showTruncated ? 'elipsis-text is-truncated' : 'elipsis-text'}
|
||||||
|
ref={containerRef}
|
||||||
|
>
|
||||||
|
<RootTag className='elipsis-text-measure' ref={measureRef}>
|
||||||
|
{text}
|
||||||
|
</RootTag>
|
||||||
|
<RootTag className='elipsis-text-full'>{text}</RootTag>
|
||||||
|
<RootTag className='elipsis-text-truncated'>
|
||||||
|
<span className='elipsis-text-start'>{start}</span>
|
||||||
|
<span className='elipsis-text-dots'>...</span>
|
||||||
|
<span className='elipsis-text-end'>
|
||||||
|
<span className='elipsis-text-end-inner'>{end}</span>
|
||||||
|
</span>
|
||||||
|
</RootTag>
|
||||||
|
</span>
|
||||||
|
</Text>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
ElipsisText.propTypes = {
|
||||||
|
children: PropTypes.node,
|
||||||
|
style: PropTypes.object,
|
||||||
|
className: PropTypes.string,
|
||||||
|
title: PropTypes.string,
|
||||||
|
code: PropTypes.bool
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ElipsisText
|
||||||
@ -3,6 +3,7 @@ import { Typography, Flex, Button, Tooltip } from 'antd'
|
|||||||
import NewMailIcon from '../../Icons/NewMailIcon'
|
import NewMailIcon from '../../Icons/NewMailIcon'
|
||||||
// import CopyIcon from './CopyIcon'
|
// import CopyIcon from './CopyIcon'
|
||||||
import CopyButton from './CopyButton'
|
import CopyButton from './CopyButton'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
|
|
||||||
const { Text, Link } = Typography
|
const { Text, Link } = Typography
|
||||||
|
|
||||||
@ -18,9 +19,9 @@ const EmailDisplay = ({ email, showCopy = true, showLink = false }) => {
|
|||||||
</Link>
|
</Link>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<Text style={{ marginRight: 8 }} ellipsis>
|
<ElipsisText style={{ marginRight: 8 }}>
|
||||||
{email}
|
{email}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
<Tooltip title='Email' arrow={false}>
|
<Tooltip title='Email' arrow={false}>
|
||||||
<Button
|
<Button
|
||||||
icon={<NewMailIcon />}
|
icon={<NewMailIcon />}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { Card, Flex, Typography, Button, Tag, Divider } from 'antd'
|
import { Card, Flex, Button, Tag, Divider } from 'antd'
|
||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
import FileIcon from '../../Icons/FileIcon'
|
import FileIcon from '../../Icons/FileIcon'
|
||||||
import BinIcon from '../../Icons/BinIcon'
|
import BinIcon from '../../Icons/BinIcon'
|
||||||
@ -11,8 +11,7 @@ import EyeSlashIcon from '../../Icons/EyeSlashIcon'
|
|||||||
import { getModelByName } from '../../../database/ObjectModels'
|
import { getModelByName } from '../../../database/ObjectModels'
|
||||||
import InfoCircleIcon from '../../Icons/InfoCircleIcon'
|
import InfoCircleIcon from '../../Icons/InfoCircleIcon'
|
||||||
import { useNavigate } from 'react-router-dom'
|
import { useNavigate } from 'react-router-dom'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
const { Text } = Typography
|
|
||||||
|
|
||||||
const FileList = ({
|
const FileList = ({
|
||||||
files,
|
files,
|
||||||
@ -87,15 +86,15 @@ const FileList = ({
|
|||||||
<Flex
|
<Flex
|
||||||
gap={'small'}
|
gap={'small'}
|
||||||
align='center'
|
align='center'
|
||||||
style={{ minWidth: 0, flex: '0 1 auto', overflow: 'hidden' }}
|
style={{ minWidth: 0, flex: '1 1 auto', overflow: 'hidden' }}
|
||||||
>
|
>
|
||||||
<FileIcon
|
<FileIcon
|
||||||
style={{ margin: 0, fontSize: card == true ? '24px' : '16px' }}
|
style={{ margin: 0, fontSize: card == true ? '24px' : '16px' }}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Text style={{ marginTop: '1px', minWidth: 0 }} ellipsis>
|
<ElipsisText style={{ marginTop: '1px', minWidth: 0 }}>
|
||||||
{file.name || file.filename || 'Unknown file'}
|
{file.name || file.filename || 'Unknown file'}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
{file.extension && <Tag style={{ margin: 0 }}>{file.extension}</Tag>}
|
{file.extension && <Tag style={{ margin: 0 }}>{file.extension}</Tag>}
|
||||||
</Flex>
|
</Flex>
|
||||||
{!minimal && (
|
{!minimal && (
|
||||||
|
|||||||
@ -4,6 +4,7 @@ import { Flex, Typography, Popover } from 'antd'
|
|||||||
import { useNavigate } from 'react-router-dom'
|
import { useNavigate } from 'react-router-dom'
|
||||||
import { useMediaQuery } from 'react-responsive'
|
import { useMediaQuery } from 'react-responsive'
|
||||||
import CopyButton from './CopyButton'
|
import CopyButton from './CopyButton'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
import SpotlightTooltip from './SpotlightTooltip'
|
import SpotlightTooltip from './SpotlightTooltip'
|
||||||
import { getModelByName } from '../../../database/ObjectModels'
|
import { getModelByName } from '../../../database/ObjectModels'
|
||||||
import { buildActionUrl } from '../../../utils/modelActions'
|
import { buildActionUrl } from '../../../utils/modelActions'
|
||||||
@ -68,13 +69,12 @@ const IdDisplay = ({
|
|||||||
|
|
||||||
if (plainCode == false) {
|
if (plainCode == false) {
|
||||||
textElement = (
|
textElement = (
|
||||||
<Text
|
<ElipsisText
|
||||||
code
|
code
|
||||||
ellipsis
|
|
||||||
style={showCopy ? { marginRight: 6, minWidth: '0px' } : undefined}
|
style={showCopy ? { marginRight: 6, minWidth: '0px' } : undefined}
|
||||||
>
|
>
|
||||||
{displayId}
|
{displayId}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,8 +83,12 @@ const IdDisplay = ({
|
|||||||
const linkElement = (
|
const linkElement = (
|
||||||
<Link
|
<Link
|
||||||
onClick={() => navigate(hyperlink)}
|
onClick={() => navigate(hyperlink)}
|
||||||
ellipsis
|
style={{
|
||||||
style={showCopy ? { marginRight: 6 } : undefined}
|
minWidth: 0,
|
||||||
|
maxWidth: '100%',
|
||||||
|
display: 'block',
|
||||||
|
...(showCopy ? { marginRight: 6 } : null)
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{textElement}
|
{textElement}
|
||||||
</Link>
|
</Link>
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
import { Flex, Typography } from 'antd'
|
import { Flex, Typography } from 'antd'
|
||||||
import CopyButton from './CopyButton'
|
import CopyButton from './CopyButton'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
|
|
||||||
const { Text } = Typography
|
const { Text } = Typography
|
||||||
|
|
||||||
@ -15,13 +16,12 @@ const MiscId = ({ value, showCopy = true }) => {
|
|||||||
className='miscid'
|
className='miscid'
|
||||||
style={{ minWidth: '0px', width: '100%' }}
|
style={{ minWidth: '0px', width: '100%' }}
|
||||||
>
|
>
|
||||||
<Text
|
<ElipsisText
|
||||||
code
|
code
|
||||||
ellipsis
|
|
||||||
style={showCopy ? { marginRight: 6, minWidth: '0px' } : undefined}
|
style={showCopy ? { marginRight: 6, minWidth: '0px' } : undefined}
|
||||||
>
|
>
|
||||||
{value}
|
{value}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
|
|
||||||
{showCopy && (
|
{showCopy && (
|
||||||
<CopyButton
|
<CopyButton
|
||||||
|
|||||||
@ -71,7 +71,9 @@ const NoteItem = ({
|
|||||||
setChildNotesLoading(true)
|
setChildNotesLoading(true)
|
||||||
try {
|
try {
|
||||||
const childNotesData = await fetchObjects('note', {
|
const childNotesData = await fetchObjects('note', {
|
||||||
filter: { 'parent._id': note._id }
|
filter: {
|
||||||
|
parent: getModelByName('note').prefix + ':' + note._id
|
||||||
|
}
|
||||||
})
|
})
|
||||||
setChildNotes(childNotesData.data)
|
setChildNotes(childNotesData.data)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@ -105,7 +107,7 @@ const NoteItem = ({
|
|||||||
if (isExpanded == true) {
|
if (isExpanded == true) {
|
||||||
subscribeToObjectTypeUpdatesRef.current = subscribeToObjectTypeUpdates(
|
subscribeToObjectTypeUpdatesRef.current = subscribeToObjectTypeUpdates(
|
||||||
'note',
|
'note',
|
||||||
{ 'parent._id': note._id },
|
{ parent: getModelByName('note').prefix + ':' + note._id },
|
||||||
() => {
|
() => {
|
||||||
if (isExpanded == true) {
|
if (isExpanded == true) {
|
||||||
handleNoteExpand()
|
handleNoteExpand()
|
||||||
|
|||||||
@ -19,6 +19,7 @@ import InfoCircleIcon from '../../Icons/InfoCircleIcon'
|
|||||||
import ReloadIcon from '../../Icons/ReloadIcon'
|
import ReloadIcon from '../../Icons/ReloadIcon'
|
||||||
import NewNote from '../Management/Notes/NewNote'
|
import NewNote from '../Management/Notes/NewNote'
|
||||||
import NoteItem from './NoteItem'
|
import NoteItem from './NoteItem'
|
||||||
|
import { getModelByName } from '../../../database/ObjectModels.js'
|
||||||
|
|
||||||
const { Text } = Typography
|
const { Text } = Typography
|
||||||
|
|
||||||
@ -40,14 +41,14 @@ const NotesPanel = ({ _id, type }) => {
|
|||||||
const fetchData = useCallback(
|
const fetchData = useCallback(
|
||||||
async (id) => {
|
async (id) => {
|
||||||
try {
|
try {
|
||||||
const newData = await fetchNotes(id)
|
const newData = await fetchNotes(id, type)
|
||||||
return newData
|
return newData
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setError(error)
|
setError(error)
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[fetchNotes]
|
[fetchNotes, type]
|
||||||
)
|
)
|
||||||
|
|
||||||
const generateNotes = useCallback(
|
const generateNotes = useCallback(
|
||||||
@ -98,7 +99,7 @@ const NotesPanel = ({ _id, type }) => {
|
|||||||
if (connected == true && subscribeToObjectTypeUpdatesRef.current == null) {
|
if (connected == true && subscribeToObjectTypeUpdatesRef.current == null) {
|
||||||
subscribeToObjectTypeUpdatesRef.current = subscribeToObjectTypeUpdates(
|
subscribeToObjectTypeUpdatesRef.current = subscribeToObjectTypeUpdates(
|
||||||
'note',
|
'note',
|
||||||
{ 'parent._id': _id },
|
{ parent: getModelByName(type).prefix + ':' + _id },
|
||||||
() => handleReloadData()
|
() => handleReloadData()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,6 +23,7 @@ import ExclamationOctagonIcon from '../../Icons/ExclamationOctagonIcon'
|
|||||||
import CheckCircleIcon from '../../Icons/CheckCircleIcon'
|
import CheckCircleIcon from '../../Icons/CheckCircleIcon'
|
||||||
import BellIcon from '../../Icons/BellIcon'
|
import BellIcon from '../../Icons/BellIcon'
|
||||||
import { getModelByName } from '../../../database/ObjectModels'
|
import { getModelByName } from '../../../database/ObjectModels'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
|
|
||||||
const { Text, Paragraph } = Typography
|
const { Text, Paragraph } = Typography
|
||||||
|
|
||||||
@ -361,13 +362,12 @@ const Notification = ({
|
|||||||
{inlineIcon &&
|
{inlineIcon &&
|
||||||
getNotificationIcon(notification.type, notification.metadata)}
|
getNotificationIcon(notification.type, notification.metadata)}
|
||||||
|
|
||||||
<Text
|
<ElipsisText
|
||||||
strong={!notification.read}
|
strong={!notification.read}
|
||||||
ellipsis
|
|
||||||
style={{ minWidth: 0 }}
|
style={{ minWidth: 0 }}
|
||||||
>
|
>
|
||||||
{notification.title}
|
{notification.title}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
</Flex>
|
</Flex>
|
||||||
<Flex align='center' gap='5px' style={{ marginLeft: 10 }}>
|
<Flex align='center' gap='5px' style={{ marginLeft: 10 }}>
|
||||||
{showDetails && (
|
{showDetails && (
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import { ApiServerContext } from '../context/ApiServerContext'
|
|||||||
import { AuthContext } from '../context/AuthContext'
|
import { AuthContext } from '../context/AuthContext'
|
||||||
import merge from 'lodash/merge'
|
import merge from 'lodash/merge'
|
||||||
import IdDisplay from './IdDisplay'
|
import IdDisplay from './IdDisplay'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
import SpotlightTooltip from './SpotlightTooltip'
|
import SpotlightTooltip from './SpotlightTooltip'
|
||||||
import StateTag from './StateTag'
|
import StateTag from './StateTag'
|
||||||
|
|
||||||
@ -183,13 +184,7 @@ const ObjectDisplay = ({
|
|||||||
const objectId = getStringId(objectData)
|
const objectId = getStringId(objectData)
|
||||||
|
|
||||||
if (defaultModelActions.length >= 1 && objectId) {
|
if (defaultModelActions.length >= 1 && objectId) {
|
||||||
hyperlink = buildActionUrl(
|
hyperlink = buildActionUrl(model, defaultModelActions[0], objectId, '', '')
|
||||||
model,
|
|
||||||
defaultModelActions[0],
|
|
||||||
objectId,
|
|
||||||
'',
|
|
||||||
''
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render name with hyperlink/spotlight support
|
// Render name with hyperlink/spotlight support
|
||||||
@ -197,9 +192,9 @@ const ObjectDisplay = ({
|
|||||||
if (!objectData?.name) return null
|
if (!objectData?.name) return null
|
||||||
|
|
||||||
const textElement = (
|
const textElement = (
|
||||||
<Text ellipsis style={{ lineHeight: '1', paddingBottom: '2px' }}>
|
<ElipsisText style={{ lineHeight: '1', paddingBottom: '2px' }}>
|
||||||
{objectData.name}
|
{objectData.name}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
)
|
)
|
||||||
|
|
||||||
// If hyperlink is enabled
|
// If hyperlink is enabled
|
||||||
@ -268,7 +263,7 @@ const ObjectDisplay = ({
|
|||||||
style={{ minWidth: 0, height: '24px' }}
|
style={{ minWidth: 0, height: '24px' }}
|
||||||
>
|
>
|
||||||
<Icon />
|
<Icon />
|
||||||
<Flex gap={'small'} align='center' style={{ minWidth: 0 }}>
|
<Flex gap={'small'} align='center' style={{ minWidth: 0, flex: 1 }}>
|
||||||
{objectData?.color ? (
|
{objectData?.color ? (
|
||||||
<Badge
|
<Badge
|
||||||
color={objectData?.color}
|
color={objectData?.color}
|
||||||
@ -282,7 +277,7 @@ const ObjectDisplay = ({
|
|||||||
style={{ marginBottom: '1.5px' }}
|
style={{ marginBottom: '1.5px' }}
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
<div style={{ minWidth: 0 }}>
|
<div style={{ minWidth: 0, flex: 1, overflow: 'hidden' }}>
|
||||||
{renderNameDisplay()}
|
{renderNameDisplay()}
|
||||||
|
|
||||||
{objectId && !objectData?.name ? (
|
{objectId && !objectData?.name ? (
|
||||||
|
|||||||
@ -51,6 +51,7 @@ import MiscId from './MiscId'
|
|||||||
import AddressDisplay from './AddressDisplay'
|
import AddressDisplay from './AddressDisplay'
|
||||||
import ArrayDisplay from './ArrayDisplay'
|
import ArrayDisplay from './ArrayDisplay'
|
||||||
import ArrayInput from './ArrayInput'
|
import ArrayInput from './ArrayInput'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
import { round } from '../utils/Utils'
|
import { round } from '../utils/Utils'
|
||||||
|
|
||||||
const { Text } = Typography
|
const { Text } = Typography
|
||||||
@ -378,11 +379,11 @@ const ObjectProperty = ({
|
|||||||
case 'text':
|
case 'text':
|
||||||
if (value != null && value != '') {
|
if (value != null && value != '') {
|
||||||
return (
|
return (
|
||||||
<Text ellipsis style={style}>
|
<ElipsisText style={style}>
|
||||||
{prefix}
|
{prefix}
|
||||||
{getTextValue(value)}
|
{getTextValue(value)}
|
||||||
{suffix}
|
{suffix}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -1,7 +1,11 @@
|
|||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
import { Descriptions, Typography, Flex } from 'antd'
|
import { Descriptions, Typography, Flex } from 'antd'
|
||||||
import { getModelProperty } from '../../../database/ObjectModels'
|
import {
|
||||||
|
getModelProperty,
|
||||||
|
getPropertyValue
|
||||||
|
} from '../../../database/ObjectModels'
|
||||||
import ObjectProperty from './ObjectProperty'
|
import ObjectProperty from './ObjectProperty'
|
||||||
|
import DiffLabel from './DiffLabel'
|
||||||
import ArrowRightIcon from '../../Icons/ArrowRightIcon'
|
import ArrowRightIcon from '../../Icons/ArrowRightIcon'
|
||||||
|
|
||||||
const { Text } = Typography
|
const { Text } = Typography
|
||||||
@ -51,6 +55,17 @@ const PropertyChanges = ({ type, value }) => {
|
|||||||
if (!changeProperty) {
|
if (!changeProperty) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const oldValue = getPropertyValue(value?.old, key)
|
||||||
|
const newValue = getPropertyValue(value?.new, key)
|
||||||
|
const isCodeKey = key === 'code' || changeProperty.type === 'codeBlock'
|
||||||
|
const isCodeEdit =
|
||||||
|
isCodeKey &&
|
||||||
|
oldValue != null &&
|
||||||
|
oldValue !== '' &&
|
||||||
|
newValue != null &&
|
||||||
|
newValue !== ''
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Descriptions.Item key={key} label={changeProperty.label}>
|
<Descriptions.Item key={key} label={changeProperty.label}>
|
||||||
<Flex
|
<Flex
|
||||||
@ -58,31 +73,41 @@ const PropertyChanges = ({ type, value }) => {
|
|||||||
style={{ minWidth: 0, width: '100%' }}
|
style={{ minWidth: 0, width: '100%' }}
|
||||||
className='property-changes'
|
className='property-changes'
|
||||||
>
|
>
|
||||||
{value?.old ? (
|
{isCodeEdit ? (
|
||||||
<ObjectProperty
|
<DiffLabel
|
||||||
{...changeProperty}
|
oldCode={oldValue}
|
||||||
longId={false}
|
newCode={newValue}
|
||||||
minimal={true}
|
language={changeProperty.language}
|
||||||
showPreview={false}
|
|
||||||
objectData={value?.old}
|
|
||||||
maxWidth='200px'
|
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : (
|
||||||
{value?.old && value?.new ? (
|
<>
|
||||||
<Text type='secondary'>
|
{value?.old ? (
|
||||||
<ArrowRightIcon />
|
<ObjectProperty
|
||||||
</Text>
|
{...changeProperty}
|
||||||
) : null}
|
longId={false}
|
||||||
{value?.new ? (
|
minimal={true}
|
||||||
<ObjectProperty
|
showPreview={false}
|
||||||
{...changeProperty}
|
objectData={value?.old}
|
||||||
longId={false}
|
maxWidth='200px'
|
||||||
minimal={true}
|
/>
|
||||||
showPreview={false}
|
) : null}
|
||||||
objectData={value?.new}
|
{value?.old && value?.new ? (
|
||||||
maxWidth='200px'
|
<Text type='secondary'>
|
||||||
/>
|
<ArrowRightIcon />
|
||||||
) : null}
|
</Text>
|
||||||
|
) : null}
|
||||||
|
{value?.new ? (
|
||||||
|
<ObjectProperty
|
||||||
|
{...changeProperty}
|
||||||
|
longId={false}
|
||||||
|
minimal={true}
|
||||||
|
showPreview={false}
|
||||||
|
objectData={value?.new}
|
||||||
|
maxWidth='200px'
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</Flex>
|
</Flex>
|
||||||
</Descriptions.Item>
|
</Descriptions.Item>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import PropTypes from 'prop-types'
|
|||||||
import { Typography, Flex, Button, Tooltip } from 'antd'
|
import { Typography, Flex, Button, Tooltip } from 'antd'
|
||||||
import LinkIcon from '../../Icons/LinkIcon'
|
import LinkIcon from '../../Icons/LinkIcon'
|
||||||
import CopyButton from './CopyButton'
|
import CopyButton from './CopyButton'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
|
|
||||||
const { Text, Link } = Typography
|
const { Text, Link } = Typography
|
||||||
|
|
||||||
@ -24,15 +25,15 @@ const UrlDisplay = ({ url, showCopy = true, showLink = false }) => {
|
|||||||
width: 0
|
width: 0
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Text ellipsis style={{ display: 'block' }}>
|
<ElipsisText style={{ display: 'block' }}>
|
||||||
{url}
|
{url}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
</Link>
|
</Link>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<Text style={{ marginRight: 8, minWidth: 0 }} ellipsis>
|
<ElipsisText style={{ marginRight: 8, minWidth: 0 }}>
|
||||||
{url}
|
{url}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
<Tooltip title='Open URL' arrow={false}>
|
<Tooltip title='Open URL' arrow={false}>
|
||||||
<Button
|
<Button
|
||||||
icon={<LinkIcon />}
|
icon={<LinkIcon />}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import { User } from '../../../database/models/User'
|
|||||||
import { buildActionUrl } from '../../../utils/modelActions'
|
import { buildActionUrl } from '../../../utils/modelActions'
|
||||||
import { AuthContext } from '../context/AuthContext'
|
import { AuthContext } from '../context/AuthContext'
|
||||||
import ObjectActions from './ObjectActions'
|
import ObjectActions from './ObjectActions'
|
||||||
|
import ElipsisText from './ElipsisText'
|
||||||
|
|
||||||
const { Text } = Typography
|
const { Text } = Typography
|
||||||
|
|
||||||
@ -89,13 +90,12 @@ const UserProfilePopover = ({ onClose }) => {
|
|||||||
)}
|
)}
|
||||||
<Flex vertical style={{ minWidth: 0 }}>
|
<Flex vertical style={{ minWidth: 0 }}>
|
||||||
{fullName && (
|
{fullName && (
|
||||||
<Text
|
<ElipsisText
|
||||||
strong
|
strong
|
||||||
ellipsis
|
|
||||||
style={{ fontSize: 18, lineHeight: 1, marginTop: 1 }}
|
style={{ fontSize: 18, lineHeight: 1, marginTop: 1 }}
|
||||||
>
|
>
|
||||||
{fullName}
|
{fullName}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
)}
|
)}
|
||||||
{email && (
|
{email && (
|
||||||
<Space>
|
<Space>
|
||||||
@ -106,13 +106,12 @@ const UserProfilePopover = ({ onClose }) => {
|
|||||||
>
|
>
|
||||||
@{username}
|
@{username}
|
||||||
</Text>
|
</Text>
|
||||||
<Text
|
<ElipsisText
|
||||||
type='secondary'
|
type='secondary'
|
||||||
ellipsis
|
|
||||||
style={{ fontSize: 12, lineHeight: 1 }}
|
style={{ fontSize: 12, lineHeight: 1 }}
|
||||||
>
|
>
|
||||||
{email}
|
{email}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
</Space>
|
</Space>
|
||||||
)}
|
)}
|
||||||
{!username && !fullName && !email && (
|
{!username && !fullName && !email && (
|
||||||
|
|||||||
@ -16,6 +16,7 @@ import {
|
|||||||
buildActionUrl,
|
buildActionUrl,
|
||||||
stripActionParams
|
stripActionParams
|
||||||
} from '../../../utils/modelActions'
|
} from '../../../utils/modelActions'
|
||||||
|
import ElipsisText from '../common/ElipsisText'
|
||||||
|
|
||||||
const ActionsModalContext = createContext()
|
const ActionsModalContext = createContext()
|
||||||
|
|
||||||
@ -291,15 +292,14 @@ const ActionsModalProvider = ({ children }) => {
|
|||||||
>
|
>
|
||||||
{Icon ? <Icon style={{ fontSize: '18px' }} /> : null}
|
{Icon ? <Icon style={{ fontSize: '18px' }} /> : null}
|
||||||
<Flex vertical style={{ flexGrow: 1, minWidth: 0 }}>
|
<Flex vertical style={{ flexGrow: 1, minWidth: 0 }}>
|
||||||
<Text
|
<ElipsisText
|
||||||
ellipsis
|
|
||||||
style={{
|
style={{
|
||||||
maxWidth: 320,
|
maxWidth: 320,
|
||||||
width: '100%'
|
width: '100%'
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{action.fullLabel || action.label || action.name}
|
{action.fullLabel || action.label || action.name}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
</Flex>
|
</Flex>
|
||||||
</Flex>
|
</Flex>
|
||||||
<Flex gap='small' align='center'>
|
<Flex gap='small' align='center'>
|
||||||
|
|||||||
@ -1543,12 +1543,12 @@ const ApiServerProvider = ({ children }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Fetch notes for a specific parent
|
// Fetch notes for a specific parent
|
||||||
const fetchNotes = async (parentId) => {
|
const fetchNotes = async (parentId, parentType) => {
|
||||||
logger.debug('Fetching notes for parent:', parentId)
|
logger.debug('Fetching notes for parent:', parentId, parentType)
|
||||||
try {
|
try {
|
||||||
const response = await axios.get(`${config.backendUrl}/notes`, {
|
const response = await axios.get(`${config.backendUrl}/notes`, {
|
||||||
params: {
|
params: {
|
||||||
'parent._id': parentId,
|
parent: getModelByName(parentType).prefix + ':' + parentId,
|
||||||
sort: 'createdAt',
|
sort: 'createdAt',
|
||||||
order: 'ascend'
|
order: 'ascend'
|
||||||
},
|
},
|
||||||
@ -1564,7 +1564,7 @@ const ApiServerProvider = ({ children }) => {
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
showError(err, () => {
|
showError(err, () => {
|
||||||
fetchNotes(parentId)
|
fetchNotes(parentId, parentType)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,6 +26,7 @@ import PropTypes from 'prop-types'
|
|||||||
import { useNavigate } from 'react-router-dom'
|
import { useNavigate } from 'react-router-dom'
|
||||||
import StateDisplay from '../common/StateDisplay'
|
import StateDisplay from '../common/StateDisplay'
|
||||||
import IdDisplay from '../common/IdDisplay'
|
import IdDisplay from '../common/IdDisplay'
|
||||||
|
import ElipsisText from '../common/ElipsisText'
|
||||||
|
|
||||||
import config from '../../../config'
|
import config from '../../../config'
|
||||||
import {
|
import {
|
||||||
@ -501,8 +502,7 @@ const SpotlightContent = ({
|
|||||||
{Icon ? <Icon style={{ fontSize: '20px' }} /> : null}
|
{Icon ? <Icon style={{ fontSize: '20px' }} /> : null}
|
||||||
|
|
||||||
{item.name ? (
|
{item.name ? (
|
||||||
<Text
|
<ElipsisText
|
||||||
ellipsis
|
|
||||||
style={{
|
style={{
|
||||||
maxWidth: 170,
|
maxWidth: 170,
|
||||||
flexGrow: 1,
|
flexGrow: 1,
|
||||||
@ -510,7 +510,7 @@ const SpotlightContent = ({
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item.name}
|
{item.name}
|
||||||
</Text>
|
</ElipsisText>
|
||||||
) : null}
|
) : null}
|
||||||
{item?.state ? (
|
{item?.state ? (
|
||||||
<StateDisplay
|
<StateDisplay
|
||||||
|
|||||||
@ -97,7 +97,6 @@ export const AppPassword = {
|
|||||||
'name',
|
'name',
|
||||||
'user',
|
'user',
|
||||||
'active',
|
'active',
|
||||||
'user._id',
|
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
'_reference'
|
'_reference'
|
||||||
|
|||||||
@ -17,8 +17,8 @@ export const AuditLog = {
|
|||||||
'createdAt'
|
'createdAt'
|
||||||
],
|
],
|
||||||
filters: [
|
filters: [
|
||||||
'parent._id',
|
'parent',
|
||||||
'owner._id',
|
'owner',
|
||||||
'operation',
|
'operation',
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
|
|||||||
@ -89,7 +89,6 @@ export const CourierService = {
|
|||||||
filters: [
|
filters: [
|
||||||
'_id',
|
'_id',
|
||||||
'courier',
|
'courier',
|
||||||
'courier._id',
|
|
||||||
'name',
|
'name',
|
||||||
'active',
|
'active',
|
||||||
'tracked',
|
'tracked',
|
||||||
|
|||||||
@ -110,7 +110,6 @@ export const Filament = {
|
|||||||
filters: [
|
filters: [
|
||||||
'_id',
|
'_id',
|
||||||
'material',
|
'material',
|
||||||
'material._id',
|
|
||||||
'diameter',
|
'diameter',
|
||||||
'name',
|
'name',
|
||||||
'cost',
|
'cost',
|
||||||
|
|||||||
@ -90,7 +90,6 @@ export const FilamentSku = {
|
|||||||
'_id',
|
'_id',
|
||||||
'barcode',
|
'barcode',
|
||||||
'filament',
|
'filament',
|
||||||
'filament._id',
|
|
||||||
'name',
|
'name',
|
||||||
'color',
|
'color',
|
||||||
'cost',
|
'cost',
|
||||||
|
|||||||
@ -45,14 +45,11 @@ export const FilamentStock = {
|
|||||||
],
|
],
|
||||||
filters: [
|
filters: [
|
||||||
'filament',
|
'filament',
|
||||||
'filament._id',
|
|
||||||
'filamentSku',
|
'filamentSku',
|
||||||
'state',
|
'state',
|
||||||
'startingWeight',
|
'startingWeight',
|
||||||
'currentWeight',
|
'currentWeight',
|
||||||
'filamentSku._id',
|
|
||||||
'stockLocation',
|
'stockLocation',
|
||||||
'stockLocation._id',
|
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
'_reference'
|
'_reference'
|
||||||
|
|||||||
@ -101,9 +101,7 @@ export const GCodeFile = {
|
|||||||
'_id',
|
'_id',
|
||||||
'name',
|
'name',
|
||||||
'filament',
|
'filament',
|
||||||
'filament._id',
|
|
||||||
'filamentSku',
|
'filamentSku',
|
||||||
'filamentSku._id',
|
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
'_reference'
|
'_reference'
|
||||||
|
|||||||
@ -166,10 +166,7 @@ export const Invoice = {
|
|||||||
'vendor',
|
'vendor',
|
||||||
'client',
|
'client',
|
||||||
'state',
|
'state',
|
||||||
'vendor._id',
|
|
||||||
'client._id',
|
|
||||||
'order',
|
'order',
|
||||||
'order._id',
|
|
||||||
'orderType',
|
'orderType',
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
|
|||||||
@ -122,7 +122,6 @@ export const ListingVarient = {
|
|||||||
],
|
],
|
||||||
filters: [
|
filters: [
|
||||||
'listing',
|
'listing',
|
||||||
'listing._id',
|
|
||||||
'product',
|
'product',
|
||||||
'productSku',
|
'productSku',
|
||||||
'state',
|
'state',
|
||||||
|
|||||||
@ -56,12 +56,10 @@ export const Note = {
|
|||||||
filters: [
|
filters: [
|
||||||
'_id',
|
'_id',
|
||||||
'user',
|
'user',
|
||||||
'user._id',
|
|
||||||
'parentType',
|
'parentType',
|
||||||
'parent',
|
'parent',
|
||||||
'parent._id',
|
'parent',
|
||||||
'noteType',
|
'noteType',
|
||||||
'noteType._id',
|
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
'_reference'
|
'_reference'
|
||||||
|
|||||||
@ -87,12 +87,9 @@ export const OrderItem = {
|
|||||||
'name',
|
'name',
|
||||||
'itemType',
|
'itemType',
|
||||||
'item',
|
'item',
|
||||||
'item._id',
|
|
||||||
'order',
|
'order',
|
||||||
'order._id',
|
|
||||||
'orderType',
|
'orderType',
|
||||||
'shipment',
|
'shipment',
|
||||||
'shipment._id',
|
|
||||||
'state',
|
'state',
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
|
|||||||
@ -92,7 +92,6 @@ export const PartSku = {
|
|||||||
'_id',
|
'_id',
|
||||||
'barcode',
|
'barcode',
|
||||||
'part',
|
'part',
|
||||||
'part._id',
|
|
||||||
'name',
|
'name',
|
||||||
'cost',
|
'cost',
|
||||||
'price',
|
'price',
|
||||||
|
|||||||
@ -36,9 +36,7 @@ export const PartStock = {
|
|||||||
'state',
|
'state',
|
||||||
'startingQuantity',
|
'startingQuantity',
|
||||||
'currentQuantity',
|
'currentQuantity',
|
||||||
'partSku._id',
|
|
||||||
'stockLocation',
|
'stockLocation',
|
||||||
'stockLocation._id',
|
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
'_reference'
|
'_reference'
|
||||||
|
|||||||
@ -163,10 +163,7 @@ export const Payment = {
|
|||||||
'vendor',
|
'vendor',
|
||||||
'client',
|
'client',
|
||||||
'state',
|
'state',
|
||||||
'vendor._id',
|
|
||||||
'client._id',
|
|
||||||
'invoice',
|
'invoice',
|
||||||
'invoice._id',
|
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
'_reference'
|
'_reference'
|
||||||
|
|||||||
@ -102,7 +102,6 @@ export const Product = {
|
|||||||
'name',
|
'name',
|
||||||
'globalPrice',
|
'globalPrice',
|
||||||
'productCategory',
|
'productCategory',
|
||||||
'productCategory._id',
|
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
'_reference'
|
'_reference'
|
||||||
|
|||||||
@ -92,7 +92,6 @@ export const ProductSku = {
|
|||||||
'_id',
|
'_id',
|
||||||
'barcode',
|
'barcode',
|
||||||
'product',
|
'product',
|
||||||
'product._id',
|
|
||||||
'name',
|
'name',
|
||||||
'cost',
|
'cost',
|
||||||
'price',
|
'price',
|
||||||
|
|||||||
@ -7,6 +7,7 @@ const PostProductStock = lazy(
|
|||||||
() => import('../../components/Dashboard/Inventory/ProductStocks/PostProductStock')
|
() => import('../../components/Dashboard/Inventory/ProductStocks/PostProductStock')
|
||||||
)
|
)
|
||||||
import ProductStockIcon from '../../components/Icons/ProductStockIcon'
|
import ProductStockIcon from '../../components/Icons/ProductStockIcon'
|
||||||
|
import { getModelByName } from '../ObjectModels.js'
|
||||||
import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
|
import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
|
||||||
import EditIcon from '../../components/Icons/EditIcon'
|
import EditIcon from '../../components/Icons/EditIcon'
|
||||||
import CheckIcon from '../../components/Icons/CheckIcon'
|
import CheckIcon from '../../components/Icons/CheckIcon'
|
||||||
@ -103,9 +104,7 @@ export const ProductStock = {
|
|||||||
'productSku',
|
'productSku',
|
||||||
'state',
|
'state',
|
||||||
'currentQuantity',
|
'currentQuantity',
|
||||||
'productSku._id',
|
|
||||||
'stockLocation',
|
'stockLocation',
|
||||||
'stockLocation._id',
|
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
'_reference'
|
'_reference'
|
||||||
@ -227,7 +226,9 @@ export const ProductStock = {
|
|||||||
masterFilter: (objectData) => {
|
masterFilter: (objectData) => {
|
||||||
const partSkuId = objectData?.partSku?._id
|
const partSkuId = objectData?.partSku?._id
|
||||||
if (partSkuId == null) return {}
|
if (partSkuId == null) return {}
|
||||||
return { 'partSku._id': partSkuId }
|
return {
|
||||||
|
partSku: getModelByName('partSku').prefix + ':' + partSkuId
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -231,7 +231,6 @@ export const PurchaseOrder = {
|
|||||||
'vendor',
|
'vendor',
|
||||||
'state',
|
'state',
|
||||||
'value',
|
'value',
|
||||||
'vendor._id',
|
|
||||||
'totalAmount',
|
'totalAmount',
|
||||||
'totalAmountWithTax',
|
'totalAmountWithTax',
|
||||||
'totalTaxAmount',
|
'totalTaxAmount',
|
||||||
|
|||||||
@ -238,7 +238,6 @@ export const SalesOrder = {
|
|||||||
'client',
|
'client',
|
||||||
'state',
|
'state',
|
||||||
'value',
|
'value',
|
||||||
'client._id',
|
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
'_reference'
|
'_reference'
|
||||||
|
|||||||
@ -147,7 +147,6 @@ export const Shipment = {
|
|||||||
'order',
|
'order',
|
||||||
'state',
|
'state',
|
||||||
'courierService',
|
'courierService',
|
||||||
'order._id',
|
|
||||||
'taxRate',
|
'taxRate',
|
||||||
'createdAt',
|
'createdAt',
|
||||||
'updatedAt',
|
'updatedAt',
|
||||||
|
|||||||
@ -9,14 +9,8 @@ export const StockEvent = {
|
|||||||
icon: StockEventIcon,
|
icon: StockEventIcon,
|
||||||
actions: [],
|
actions: [],
|
||||||
columns: ['_reference', 'owner', 'parent', 'value', 'createdAt', 'updatedAt'],
|
columns: ['_reference', 'owner', 'parent', 'value', 'createdAt', 'updatedAt'],
|
||||||
filters: [
|
filters: ['owner', 'parent', 'createdAt', 'updatedAt', '_reference'],
|
||||||
'owner._id',
|
sorters: ['createdAt', 'updatedAt'],
|
||||||
'parent._id',
|
|
||||||
'createdAt',
|
|
||||||
'updatedAt',
|
|
||||||
'_reference'
|
|
||||||
],
|
|
||||||
sorters: ['createdAt','updatedAt'],
|
|
||||||
properties: [
|
properties: [
|
||||||
{
|
{
|
||||||
name: '_id',
|
name: '_id',
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user