mirror of
https://github.com/inventree/InvenTree.git
synced 2026-07-10 17:11:01 +00:00
fix(backend): import session metadata (#12184)
* add storage for historic import metadata for reporting and display purposes fixes breakage fromhttps://github.com/inventree/InvenTree/pull/12169 * add api bump * re-enable test * fix migration * ensure session is not overwritten * fix statusrender without custom key
This commit is contained in:
@@ -783,7 +783,7 @@ export default function BuildDetail() {
|
||||
? []
|
||||
: [
|
||||
<StatusRenderer
|
||||
status={build.status_custom_key}
|
||||
status={build.status_custom_key || build.status}
|
||||
type={ModelType.build}
|
||||
options={{ size: 'lg' }}
|
||||
/>,
|
||||
|
||||
@@ -543,7 +543,7 @@ export default function PurchaseOrderDetail() {
|
||||
? []
|
||||
: [
|
||||
<StatusRenderer
|
||||
status={order.status_custom_key}
|
||||
status={order.status_custom_key || order.status}
|
||||
type={ModelType.purchaseorder}
|
||||
options={{ size: 'lg' }}
|
||||
/>
|
||||
|
||||
@@ -390,7 +390,7 @@ export default function ReturnOrderDetail() {
|
||||
? []
|
||||
: [
|
||||
<StatusRenderer
|
||||
status={order.status_custom_key}
|
||||
status={order.status_custom_key || order.status}
|
||||
type={ModelType.returnorder}
|
||||
options={{ size: 'lg' }}
|
||||
/>
|
||||
|
||||
@@ -605,7 +605,7 @@ export default function SalesOrderDetail() {
|
||||
? []
|
||||
: [
|
||||
<StatusRenderer
|
||||
status={order.status_custom_key}
|
||||
status={order.status_custom_key || order.status}
|
||||
type={ModelType.salesorder}
|
||||
options={{ size: 'lg' }}
|
||||
key={order.pk}
|
||||
|
||||
@@ -356,7 +356,7 @@ export default function TransferOrderDetail() {
|
||||
? []
|
||||
: [
|
||||
<StatusRenderer
|
||||
status={order.status_custom_key}
|
||||
status={order.status_custom_key || order.status}
|
||||
type={ModelType.transferorder}
|
||||
options={{ size: 'lg' }}
|
||||
/>
|
||||
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
useCreateApiFormModal,
|
||||
useDeleteApiFormModal
|
||||
} from '../../hooks/UseForm';
|
||||
import useStatusCodes from '../../hooks/UseStatusCodes';
|
||||
import { useImporterState } from '../../states/ImporterState';
|
||||
import { DateColumn, StatusColumn } from '../ColumnRenderers';
|
||||
import { StatusFilterOptions, UserFilter } from '../Filter';
|
||||
@@ -26,6 +27,9 @@ import { InvenTreeTable } from '../InvenTreeTable';
|
||||
export default function ImportSessionTable() {
|
||||
const table = useTable('importsession');
|
||||
const openImporter = useImporterState((state) => state.openImporter);
|
||||
const importSessionStatus = useStatusCodes({
|
||||
modelType: ModelType.importsession
|
||||
});
|
||||
|
||||
const [selectedSession, setSelectedSession] = useState<number | undefined>(
|
||||
undefined
|
||||
@@ -82,13 +86,20 @@ export default function ImportSessionTable() {
|
||||
sortable: false,
|
||||
accessor: 'row_count',
|
||||
title: t`Imported Rows`,
|
||||
render: (record: any) => (
|
||||
<ProgressBar
|
||||
progressLabel={true}
|
||||
value={record.completed_row_count}
|
||||
maximum={record.row_count}
|
||||
/>
|
||||
)
|
||||
render: (record: any) =>
|
||||
record.status == importSessionStatus.COMPLETE ? (
|
||||
<ProgressBar
|
||||
progressLabel={true}
|
||||
value={record.completed_row_count_history}
|
||||
maximum={record.row_count_history}
|
||||
/>
|
||||
) : (
|
||||
<ProgressBar
|
||||
progressLabel={true}
|
||||
value={record.completed_row_count}
|
||||
maximum={record.row_count}
|
||||
/>
|
||||
)
|
||||
}
|
||||
];
|
||||
}, []);
|
||||
|
||||
@@ -60,7 +60,7 @@ test('Importing - Admin Center', async ({ browser }) => {
|
||||
await page.getByRole('button', { name: 'Close' }).click();
|
||||
|
||||
// Confirmation of full import success
|
||||
// await page.getByRole('cell', { name: '3 / 3' }).first().waitFor();
|
||||
await page.getByRole('cell', { name: '3 / 3' }).first().waitFor();
|
||||
|
||||
// Manually delete records
|
||||
await page.getByRole('checkbox', { name: 'Select all records' }).check();
|
||||
|
||||
Reference in New Issue
Block a user