diff --git a/src/frontend/src/components/nav/NavigationDrawer.tsx b/src/frontend/src/components/nav/NavigationDrawer.tsx
index 7bb8c90fa1..c68eacf100 100644
--- a/src/frontend/src/components/nav/NavigationDrawer.tsx
+++ b/src/frontend/src/components/nav/NavigationDrawer.tsx
@@ -18,6 +18,7 @@ import { MenuLinkItem, MenuLinks } from '../items/MenuLinks';
// TODO @matmair #1: implement plugin loading and menu item generation see #5269
const plugins: MenuLinkItem[] = [];
+const onlyItems = Object.values(menuItems);
export function NavigationDrawer({
opened,
@@ -60,7 +61,7 @@ function DrawerContent() {
{t`Pages`}
-
+ {badges}
+
diff --git a/src/frontend/src/components/render/StatusRenderer.tsx b/src/frontend/src/components/render/StatusRenderer.tsx
index c737c7e905..78fb3f9414 100644
--- a/src/frontend/src/components/render/StatusRenderer.tsx
+++ b/src/frontend/src/components/render/StatusRenderer.tsx
@@ -74,13 +74,7 @@ export const StatusRenderer = ({
}) => {
const statusCodeList = useGlobalStatusState.getState().status;
- if (status === undefined) {
- console.log('StatusRenderer: status is undefined');
- return null;
- }
-
- if (statusCodeList === undefined) {
- console.log('StatusRenderer: statusCodeList is undefined');
+ if (status === undefined || statusCodeList === undefined) {
return null;
}
diff --git a/src/frontend/src/contexts/LanguageContext.tsx b/src/frontend/src/contexts/LanguageContext.tsx
index 7a93f39baa..467f82627f 100644
--- a/src/frontend/src/contexts/LanguageContext.tsx
+++ b/src/frontend/src/contexts/LanguageContext.tsx
@@ -101,6 +101,7 @@ export function LanguageContext({ children }: { children: JSX.Element }) {
// Clear out cached table column names
useLocalState.getState().clearTableColumnNames();
})
+ /* istanbul ignore next */
.catch((err) => {
console.error('Failed loading translations', err);
if (isMounted.current) setLoadedState('error');
@@ -115,6 +116,7 @@ export function LanguageContext({ children }: { children: JSX.Element }) {
return
diff --git a/src/frontend/src/defaults/actions.tsx b/src/frontend/src/defaults/actions.tsx
new file mode 100644
index 0000000000..4ffac3055f
--- /dev/null
+++ b/src/frontend/src/defaults/actions.tsx
@@ -0,0 +1,59 @@
+import { t } from '@lingui/macro';
+import type { SpotlightAction } from '@mantine/spotlight';
+import { IconHome, IconLink, IconPointer } from '@tabler/icons-react';
+import { NavigateFunction } from 'react-router-dom';
+
+import { useLocalState } from '../states/LocalState';
+import { aboutInvenTree, docLinks, licenseInfo, serverInfo } from './links';
+import { menuItems } from './menuItems';
+
+export function getActions(navigate: NavigateFunction) {
+ const setNavigationOpen = useLocalState((state) => state.setNavigationOpen);
+
+ const actions: SpotlightAction[] = [
+ {
+ title: t`Home`,
+ description: `Go to the home page`,
+ onTrigger: () => navigate(menuItems.home.link),
+ icon: Home ,
link: '/',
highlight: true
},
- {
+ profile: {
id: 'profile',
text: Account settings ,
link: '/settings/user',
doctext: User attributes and design settings.
},
- {
+ scan: {
id: 'scan',
text: Scanning ,
link: '/scan',
doctext: View for interactive scanning and multiple actions. ,
highlight: true
},
- {
+ dashboard: {
id: 'dashboard',
text: Dashboard ,
link: '/dashboard'
},
- {
+ parts: {
id: 'parts',
text: Parts ,
link: '/part/'
},
- {
+ stock: {
id: 'stock',
text: Stock ,
link: '/stock'
},
- {
+ build: {
id: 'build',
text: Build ,
link: '/build/'
},
- {
+ purchasing: {
id: 'purchasing',
text: Purchasing ,
link: '/purchasing/'
},
- {
+ sales: {
id: 'sales',
text: Sales ,
link: '/sales/'
},
- {
+ 'settings-system': {
id: 'settings-system',
text: System Settings ,
link: '/settings/system'
},
- {
+ 'settings-admin': {
id: 'settings-admin',
text: Admin Center ,
link: '/settings/admin'
}
-];
+};
if (IS_DEV_OR_DEMO) {
- menuItems.push({
+ menuItems['playground'] = {
id: 'playground',
text: Playground ,
link: '/playground',
highlight: true
- });
+ };
}
diff --git a/src/frontend/src/enums/ApiEndpoints.tsx b/src/frontend/src/enums/ApiEndpoints.tsx
index 7911a0d9c7..dd5fab30da 100644
--- a/src/frontend/src/enums/ApiEndpoints.tsx
+++ b/src/frontend/src/enums/ApiEndpoints.tsx
@@ -15,14 +15,15 @@ export enum ApiEndpoints {
user_roles = 'user/roles/',
user_token = 'user/token/',
user_simple_login = 'email/generate/',
- user_reset = 'auth/password/reset/', // Note leading prefix here
- user_reset_set = 'auth/password/reset/confirm/', // Note leading prefix here
+ user_reset = 'auth/password/reset/',
+ user_reset_set = 'auth/password/reset/confirm/',
user_sso = 'auth/social/',
user_sso_remove = 'auth/social/:id/disconnect/',
user_emails = 'auth/emails/',
user_email_remove = 'auth/emails/:id/remove/',
user_email_verify = 'auth/emails/:id/verify/',
user_email_primary = 'auth/emails/:id/primary/',
+ user_login = 'auth/login/',
user_logout = 'auth/logout/',
user_register = 'auth/registration/',
@@ -61,6 +62,8 @@ export enum ApiEndpoints {
part_parameter_template_list = 'part/parameter/template/',
part_thumbs_list = 'part/thumbs/',
part_pricing_get = 'part/:id/pricing/',
+ part_pricing_internal = 'part/internal-price/',
+ part_pricing_sale = 'part/sale-price/',
part_stocktake_list = 'part/stocktake/',
category_list = 'part/category/',
category_tree = 'part/category/tree/',
@@ -75,6 +78,7 @@ export enum ApiEndpoints {
address_list = 'company/address/',
company_attachment_list = 'company/attachment/',
supplier_part_list = 'company/part/',
+ supplier_part_pricing_list = 'company/price-break/',
manufacturer_part_list = 'company/part/manufacturer/',
manufacturer_part_attachment_list = 'company/part/manufacturer/attachment/',
manufacturer_part_parameter_list = 'company/part/manufacturer/parameter/',
@@ -101,9 +105,12 @@ export enum ApiEndpoints {
purchase_order_line_list = 'order/po-line/',
purchase_order_attachment_list = 'order/po/attachment/',
purchase_order_receive = 'order/po/:id/receive/',
+
sales_order_list = 'order/so/',
+ sales_order_line_list = 'order/so-line/',
sales_order_attachment_list = 'order/so/attachment/',
sales_order_shipment_list = 'order/so/shipment/',
+
return_order_list = 'order/ro/',
return_order_attachment_list = 'order/ro/attachment/',
diff --git a/src/frontend/src/forms/BuildForms.tsx b/src/frontend/src/forms/BuildForms.tsx
index b89bed64fd..dd4523a6bc 100644
--- a/src/frontend/src/forms/BuildForms.tsx
+++ b/src/frontend/src/forms/BuildForms.tsx
@@ -7,57 +7,64 @@ import {
IconUser,
IconUsersGroup
} from '@tabler/icons-react';
+import { useMemo } from 'react';
import { ApiFormFieldSet } from '../components/forms/fields/ApiFormField';
/**
* Field set for BuildOrder forms
*/
-export function buildOrderFields(): ApiFormFieldSet {
- return {
- reference: {},
- part: {
- filters: {
- assembly: true,
- virtual: false
+export function useBuildOrderFields({
+ create
+}: {
+ create: boolean;
+}): ApiFormFieldSet {
+ return useMemo(() => {
+ return {
+ reference: {},
+ part: {
+ filters: {
+ assembly: true,
+ virtual: false
+ }
+ },
+ title: {},
+ quantity: {},
+ project_code: {
+ icon: (partPk);
-
- useEffect(() => {
- setPart(partPk);
- }, [partPk]);
-
+export function useSupplierPartFields() {
return useMemo(() => {
const fields: ApiFormFieldSet = {
part: {
- hidden: hidePart,
- value: part,
- onValueChange: setPart,
filters: {
- purchaseable: true
+ purchaseable: true,
+ active: true
}
},
manufacturer_part: {
@@ -45,15 +32,18 @@ export function useSupplierPartFields({
part_detail: true,
manufacturer_detail: true
},
- adjustFilters: (filters: any) => {
- if (part) {
- filters.part = part;
- }
-
- return filters;
+ adjustFilters: (adjust: ApiFormAdjustFilterType) => {
+ return {
+ ...adjust.filters,
+ part: adjust.data.part
+ };
+ }
+ },
+ supplier: {
+ filters: {
+ active: true
}
},
- supplier: {},
SKU: {
icon: ('');
@@ -60,16 +64,20 @@ export function usePurchaseOrderLineItemFields({
filters: {
supplier_detail: true
},
- hidden: true
+ disabled: true
},
part: {
filters: {
part_detail: true,
- supplier_detail: true
+ supplier_detail: true,
+ active: true,
+ part_active: true
},
- adjustFilters: (value: ApiFormAdjustFilterType) => {
- // TODO: Adjust part based on the supplier associated with the supplier
- return value.filters;
+ adjustFilters: (adjust: ApiFormAdjustFilterType) => {
+ return {
+ ...adjust.filters,
+ supplier: supplierId
+ };
}
},
quantity: {},
@@ -105,7 +113,7 @@ export function usePurchaseOrderLineItemFields({
}
return fields;
- }, [create, autoPricing, purchasePrice]);
+ }, [create, orderId, supplierId, autoPricing, purchasePrice]);
return fields;
}
@@ -113,50 +121,53 @@ export function usePurchaseOrderLineItemFields({
/**
* Construct a set of fields for creating / editing a PurchaseOrder instance
*/
-export function purchaseOrderFields(): ApiFormFieldSet {
- return {
- reference: {
- icon:
+
+
+
+
+ Logging out
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/src/frontend/src/pages/Index/Playground.tsx b/src/frontend/src/pages/Index/Playground.tsx
index 3bbf0f527d..bdeabf7ef8 100644
--- a/src/frontend/src/pages/Index/Playground.tsx
+++ b/src/frontend/src/pages/Index/Playground.tsx
@@ -2,6 +2,8 @@ import { Trans } from '@lingui/macro';
import { Button, Card, Stack, TextInput } from '@mantine/core';
import { Group, Text } from '@mantine/core';
import { Accordion } from '@mantine/core';
+import { spotlight } from '@mantine/spotlight';
+import { IconAlien } from '@tabler/icons-react';
import { ReactNode, useMemo, useState } from 'react';
import { OptionsApiForm } from '../../components/forms/ApiForm';
@@ -167,6 +169,38 @@ function StatusLabelPlayground() {
);
}
+// Sample for spotlight actions
+function SpotlighPlayground() {
+ return (
+ {
+ spotlight.registerActions([
+ {
+ id: 'secret-action-1',
+ title: 'Secret action',
+ description: 'It was registered with a button click',
+ icon:
+ );
+}
+
/** Construct a simple accordion group with title and content */
function PlaygroundArea({
title,
@@ -207,6 +241,10 @@ export default function Playground() {
title="Status labels"
content={ {
+ return [
+
-
@@ -524,8 +525,9 @@ export default function PartDetail() {
},
{
name: 'pricing',
- label: t`Pricing`,
- icon:
-
- Stock: {part.in_stock}
-
-
- );
- }, [part, id]);
+ const badges: ReactNode[] = useMemo(() => {
+ if (instanceQuery.isLoading || instanceQuery.isFetching) {
+ return [];
+ }
+
+ return [
+ = part.minimum_stock ? 'green' : 'orange'}
+ visible={part.in_stock > 0}
+ />,
+ 0}
+ />,
+ 0}
+ />,
+
([panelOptions.overview]);
+ function doNavigation(panel: panelOptions) {
+ if (!value.includes(panel)) {
+ setValue([...value, panel]);
+ }
+ const element = document.getElementById(panel);
+ if (element) {
+ element.scrollIntoView();
+ }
+ }
+
+ return (
+
+
+ {t`No pricing data found for this part.`}
+
+ )}
+ {pricing && (
+
+
+ )}
+
+ );
+}
diff --git a/src/frontend/src/pages/part/pricing/BomPricingPanel.tsx b/src/frontend/src/pages/part/pricing/BomPricingPanel.tsx
new file mode 100644
index 0000000000..b8228b0334
--- /dev/null
+++ b/src/frontend/src/pages/part/pricing/BomPricingPanel.tsx
@@ -0,0 +1,241 @@
+import { t } from '@lingui/macro';
+import {
+ Group,
+ SegmentedControl,
+ SimpleGrid,
+ Stack,
+ Text
+} from '@mantine/core';
+import { ReactNode, useMemo, useState } from 'react';
+import {
+ Bar,
+ BarChart,
+ Cell,
+ Legend,
+ Pie,
+ PieChart,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis
+} from 'recharts';
+
+import { CHART_COLORS } from '../../../components/charts/colors';
+import { tooltipFormatter } from '../../../components/charts/tooltipFormatter';
+import {
+ formatCurrency,
+ formatDecimal,
+ formatPriceRange
+} from '../../../defaults/formatters';
+import { ApiEndpoints } from '../../../enums/ApiEndpoints';
+import { ModelType } from '../../../enums/ModelType';
+import { useTable } from '../../../hooks/UseTable';
+import { apiUrl } from '../../../states/ApiState';
+import { TableColumn } from '../../../tables/Column';
+import { DateColumn, PartColumn } from '../../../tables/ColumnRenderers';
+import { InvenTreeTable } from '../../../tables/InvenTreeTable';
+import { NoPricingData } from './PricingPanel';
+
+// Display BOM data as a pie chart
+function BomPieChart({ data, currency }: { data: any[]; currency: string }) {
+ return (
+
+
+
+ {data.map((_entry, index) => (
+ |
+ ))}
+
+
+ {data.map((_entry, index) => (
+ |
+ ))}
+
+ tooltipFormatter(label, currency)}
+ />
+
+
+ );
+}
+
+// Display BOM data as a bar chart
+function BomBarChart({ data, currency }: { data: any[]; currency: string }) {
+ return (
+
+
+
+ formatCurrency(value, {
+ currency: currency
+ })?.toString() ?? ''
+ }
+ />
+ tooltipFormatter(label, currency)}
+ />
+
+
+ );
+}
+
+export default function BomPricingPanel({
+ part,
+ pricing
+}: {
+ part: any;
+ pricing: any;
+}): ReactNode {
+ const table = useTable('pricing-bom');
+
+ const columns: TableColumn[] = useMemo(() => {
+ return [
+ {
+ accessor: 'name',
+ title: t`Component`,
+ sortable: true,
+ switchable: false,
+ render: (record: any) => PartColumn(record.sub_part_detail)
+ },
+ {
+ accessor: 'quantity',
+ title: t`Quantity`,
+ sortable: true,
+ switchable: false,
+ render: (record: any) => {
+ let quantity = formatDecimal(record.quantity);
+ let units = record.sub_part_detail?.units;
+
+ return (
+
+ {quantity}
+ {units && [{units}] }
+
+ );
+ }
+ },
+ {
+ accessor: 'unit_price',
+ ordering: 'pricing_max',
+ sortable: true,
+ switchable: true,
+ title: t`Unit Price`,
+ render: (record: any) => {
+ return formatPriceRange(record.pricing_min, record.pricing_max, {
+ currency: pricing?.currency
+ });
+ }
+ },
+ {
+ accessor: 'total_price',
+ title: t`Total Price`,
+ ordering: 'pricing_max_total',
+ sortable: true,
+ switchable: false,
+ render: (record: any) => {
+ return formatPriceRange(
+ record.pricing_min_total,
+ record.pricing_max_total,
+ {
+ currency: pricing?.currency
+ }
+ );
+ }
+ },
+ DateColumn({
+ accessor: 'pricing_updated',
+ title: t`Updated`,
+ sortable: true,
+ switchable: true
+ })
+ ];
+ }, [part, pricing]);
+
+ const bomPricingData: any[] = useMemo(() => {
+ const pricing = table.records.map((entry: any) => {
+ return {
+ name: entry.sub_part_detail?.name,
+ unit_price_min: parseFloat(entry.pricing_min ?? 0),
+ unit_price_max: parseFloat(entry.pricing_max ?? 0),
+ total_price_min: parseFloat(entry.pricing_min_total ?? 0),
+ total_price_max: parseFloat(entry.pricing_max_total ?? 0)
+ };
+ });
+
+ return pricing;
+ }, [table.records]);
+
+ const [chartType, setChartType] = useState('pie');
+
+ return (
+
+
+
+ {chartType == 'bar' && (
+
+ ) : (
+
+
+ );
+}
diff --git a/src/frontend/src/pages/part/pricing/PriceBreakPanel.tsx b/src/frontend/src/pages/part/pricing/PriceBreakPanel.tsx
new file mode 100644
index 0000000000..a82f837e41
--- /dev/null
+++ b/src/frontend/src/pages/part/pricing/PriceBreakPanel.tsx
@@ -0,0 +1,203 @@
+import { t } from '@lingui/macro';
+import { SimpleGrid } from '@mantine/core';
+import { useCallback, useMemo, useState } from 'react';
+import {
+ Bar,
+ BarChart,
+ Legend,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis
+} from 'recharts';
+
+import { AddItemButton } from '../../../components/buttons/AddItemButton';
+import { CHART_COLORS } from '../../../components/charts/colors';
+import { tooltipFormatter } from '../../../components/charts/tooltipFormatter';
+import { ApiFormFieldSet } from '../../../components/forms/fields/ApiFormField';
+import { formatCurrency } from '../../../defaults/formatters';
+import { ApiEndpoints } from '../../../enums/ApiEndpoints';
+import { UserRoles } from '../../../enums/Roles';
+import {
+ useCreateApiFormModal,
+ useDeleteApiFormModal,
+ useEditApiFormModal
+} from '../../../hooks/UseForm';
+import { useTable } from '../../../hooks/UseTable';
+import { apiUrl } from '../../../states/ApiState';
+import { useUserState } from '../../../states/UserState';
+import { TableColumn } from '../../../tables/Column';
+import { InvenTreeTable } from '../../../tables/InvenTreeTable';
+import { RowDeleteAction, RowEditAction } from '../../../tables/RowActions';
+import { NoPricingData } from './PricingPanel';
+
+export default function PriceBreakPanel({
+ part,
+ endpoint
+}: {
+ part: any;
+ endpoint: ApiEndpoints;
+}) {
+ const user = useUserState();
+ const table = useTable('pricing-internal');
+
+ const priceBreakFields: ApiFormFieldSet = useMemo(() => {
+ return {
+ part: {
+ disabled: true
+ },
+ quantity: {},
+ price: {},
+ price_currency: {}
+ };
+ }, []);
+
+ const tableUrl = useMemo(() => {
+ return apiUrl(endpoint);
+ }, [endpoint]);
+
+ const [selectedPriceBreak, setSelectedPriceBreak] = useState(0);
+
+ const newPriceBreak = useCreateApiFormModal({
+ url: tableUrl,
+ title: t`Add Price Break`,
+ fields: priceBreakFields,
+ initialData: {
+ part: part.pk
+ },
+ onFormSuccess: (data: any) => {
+ table.updateRecord(data);
+ }
+ });
+
+ const editPriceBreak = useEditApiFormModal({
+ url: tableUrl,
+ pk: selectedPriceBreak,
+ title: t`Edit Price Break`,
+ fields: priceBreakFields,
+ onFormSuccess: (data: any) => {
+ table.updateRecord(data);
+ }
+ });
+
+ const deletePriceBreak = useDeleteApiFormModal({
+ url: tableUrl,
+ pk: selectedPriceBreak,
+ title: t`Delete Price Break`,
+ onFormSuccess: () => {
+ table.refreshTable();
+ }
+ });
+
+ const columns: TableColumn[] = useMemo(() => {
+ return [
+ {
+ accessor: 'quantity',
+ title: t`Quantity`,
+ sortable: true,
+ switchable: false
+ },
+ {
+ accessor: 'price',
+ title: t`Price Break`,
+ sortable: true,
+ switchable: false,
+ render: (record: any) => {
+ return formatCurrency(record.price, {
+ currency: record.price_currency
+ });
+ }
+ }
+ ];
+ }, []);
+
+ const tableActions = useMemo(() => {
+ return [
+ {
+ newPriceBreak.open();
+ }}
+ hidden={!user.hasAddRole(UserRoles.part)}
+ />
+ ];
+ }, [user]);
+
+ const rowActions = useCallback(
+ (record: any) => {
+ return [
+ RowEditAction({
+ hidden: !user.hasChangeRole(UserRoles.part),
+ onClick: () => {
+ setSelectedPriceBreak(record.pk);
+ editPriceBreak.open();
+ }
+ }),
+ RowDeleteAction({
+ hidden: !user.hasDeleteRole(UserRoles.part),
+ onClick: () => {
+ setSelectedPriceBreak(record.pk);
+ deletePriceBreak.open();
+ }
+ })
+ ];
+ },
+ [user]
+ );
+
+ const currency: string = useMemo(() => {
+ if (table.records.length === 0) {
+ return '';
+ }
+ return table.records[0].currency;
+ }, [table.records]);
+
+ return (
+ <>
+ {newPriceBreak.modal}
+ {editPriceBreak.modal}
+ {deletePriceBreak.modal}
+
+
+
+
+ formatCurrency(value, {
+ currency: currency
+ })?.toString() ?? ''
+ }
+ />
+
+ tooltipFormatter(label, currency)
+ }
+ />
+
+
+ ) : (
+
+
+ );
+}
diff --git a/src/frontend/src/pages/part/pricing/PricingOverviewPanel.tsx b/src/frontend/src/pages/part/pricing/PricingOverviewPanel.tsx
new file mode 100644
index 0000000000..c034793e29
--- /dev/null
+++ b/src/frontend/src/pages/part/pricing/PricingOverviewPanel.tsx
@@ -0,0 +1,222 @@
+import { t } from '@lingui/macro';
+import {
+ Alert,
+ Anchor,
+ Group,
+ Paper,
+ SimpleGrid,
+ Stack,
+ Text
+} from '@mantine/core';
+import {
+ IconBuildingWarehouse,
+ IconChartDonut,
+ IconExclamationCircle,
+ IconList,
+ IconReportAnalytics,
+ IconShoppingCart,
+ IconTriangleSquareCircle
+} from '@tabler/icons-react';
+import { DataTable, DataTableColumn } from 'mantine-datatable';
+import { ReactNode, useMemo } from 'react';
+import {
+ Bar,
+ BarChart,
+ Legend,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis
+} from 'recharts';
+
+import { CHART_COLORS } from '../../../components/charts/colors';
+import { tooltipFormatter } from '../../../components/charts/tooltipFormatter';
+import { formatCurrency, renderDate } from '../../../defaults/formatters';
+import { panelOptions } from '../PartPricingPanel';
+
+interface PricingOverviewEntry {
+ icon: ReactNode;
+ name: panelOptions;
+ title: string;
+ min_value: number | null | undefined;
+ max_value: number | null | undefined;
+ visible?: boolean;
+ currency?: string | null | undefined;
+}
+
+export default function PricingOverviewPanel({
+ part,
+ pricing,
+ doNavigation
+}: {
+ part: any;
+ pricing: any;
+ doNavigation: (panel: panelOptions) => void;
+}): ReactNode {
+ const columns: DataTableColumn[] = useMemo(() => {
+ return [
+ {
+ accessor: 'title',
+ title: t`Pricing Category`,
+ render: (record: PricingOverviewEntry) => {
+ const is_link = record.name !== panelOptions.overall;
+ return (
+
+ {record.icon}
+ {is_link ? (
+ doNavigation(record.name)}>
+ {record.title}
+
+ ) : (
+ {record.title}
+ )}
+
+ );
+ }
+ },
+ {
+ accessor: 'min_value',
+ title: t`Minimum`,
+ render: (record: PricingOverviewEntry) => {
+ if (record?.min_value === null || record?.min_value === undefined) {
+ return '-';
+ }
+ return formatCurrency(record?.min_value, {
+ currency: record.currency ?? pricing?.currency
+ });
+ }
+ },
+ {
+ accessor: 'max_value',
+ title: t`Maximum`,
+ render: (record: PricingOverviewEntry) => {
+ if (record?.max_value === null || record?.max_value === undefined) {
+ return '-';
+ }
+
+ return formatCurrency(record?.max_value, {
+ currency: record.currency ?? pricing?.currency
+ });
+ }
+ }
+ ];
+ }, [part, pricing]);
+
+ const overviewData: PricingOverviewEntry[] = useMemo(() => {
+ return [
+ {
+ name: panelOptions.internal,
+ title: t`Internal Pricing`,
+ icon:
+
+
+ {pricing?.updated && (
+
+
+ {renderDate(pricing.updated)}
+
+
+ )}
+
+
+
+
+ formatCurrency(value, {
+ currency: pricing?.currency
+ })?.toString() ?? ''
+ }
+ />
+
+ tooltipFormatter(label, pricing?.currency)
+ }
+ />
+
+
+
+
+ );
+}
diff --git a/src/frontend/src/pages/part/pricing/PricingPanel.tsx b/src/frontend/src/pages/part/pricing/PricingPanel.tsx
new file mode 100644
index 0000000000..de9dac2bfe
--- /dev/null
+++ b/src/frontend/src/pages/part/pricing/PricingPanel.tsx
@@ -0,0 +1,70 @@
+import { t } from '@lingui/macro';
+import {
+ Accordion,
+ AccordionControlProps,
+ Alert,
+ Box,
+ Space,
+ Stack,
+ Text,
+ Tooltip
+} from '@mantine/core';
+import { IconAlertCircle, IconExclamationCircle } from '@tabler/icons-react';
+import { ReactNode } from 'react';
+
+import { StylishText } from '../../../components/items/StylishText';
+import { panelOptions } from '../PartPricingPanel';
+
+function AccordionControl(props: AccordionControlProps) {
+ return (
+
+ {props.disabled && (
+
+ );
+}
+
+export default function PricingPanel({
+ content,
+ label,
+ title,
+ visible,
+ disabled = undefined
+}: {
+ content: ReactNode;
+ label: panelOptions;
+ title: string;
+ visible: boolean;
+ disabled?: boolean | undefined;
+}): ReactNode {
+ const is_disabled = disabled === undefined ? false : disabled;
+ return (
+ visible && (
+
+
+ {title}
+
+ {!is_disabled && content}
+
+ )
+ );
+}
+
+export function NoPricingData() {
+ return (
+
+ {t`No pricing data available`}
+
+
+ );
+}
diff --git a/src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx b/src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx
new file mode 100644
index 0000000000..ae88a6d7c4
--- /dev/null
+++ b/src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx
@@ -0,0 +1,165 @@
+import { t } from '@lingui/macro';
+import { Group, SimpleGrid, Text } from '@mantine/core';
+import { ReactNode, useCallback, useMemo } from 'react';
+import {
+ Bar,
+ BarChart,
+ Legend,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis
+} from 'recharts';
+
+import { CHART_COLORS } from '../../../components/charts/colors';
+import { tooltipFormatter } from '../../../components/charts/tooltipFormatter';
+import { formatCurrency, renderDate } from '../../../defaults/formatters';
+import { ApiEndpoints } from '../../../enums/ApiEndpoints';
+import { useTable } from '../../../hooks/UseTable';
+import { apiUrl } from '../../../states/ApiState';
+import { TableColumn } from '../../../tables/Column';
+import { InvenTreeTable } from '../../../tables/InvenTreeTable';
+import { NoPricingData } from './PricingPanel';
+
+export default function PurchaseHistoryPanel({
+ part
+}: {
+ part: any;
+}): ReactNode {
+ const table = useTable('pricing-purchase-history');
+
+ const calculateUnitPrice = useCallback((record: any) => {
+ let pack_quantity = record?.supplier_part_detail?.pack_quantity_native ?? 1;
+ let unit_price = record.purchase_price / pack_quantity;
+
+ return unit_price;
+ }, []);
+
+ const columns: TableColumn[] = useMemo(() => {
+ return [
+ {
+ accessor: 'order',
+ title: t`Purchase Order`,
+ render: (record: any) => record?.order_detail?.reference,
+ sortable: true,
+ switchable: false
+ },
+ {
+ accessor: 'order_detail.complete_date',
+ ordering: 'complete_date',
+ title: t`Date`,
+ sortable: true,
+ switchable: true,
+ render: (record: any) => renderDate(record.order_detail.complete_date)
+ },
+ {
+ accessor: 'purchase_price',
+ title: t`Purchase Price`,
+ sortable: true,
+ switchable: false,
+ render: (record: any) => {
+ let price = formatCurrency(record.purchase_price, {
+ currency: record.purchase_price_currency
+ });
+
+ let units = record.supplier_part_detail?.pack_quantity;
+
+ return (
+
+ {price}
+ {units && [{units}] }
+
+ );
+ }
+ },
+ {
+ accessor: 'unit_price',
+ title: t`Unit Price`,
+ ordering: 'purchase_price',
+ sortable: true,
+ switchable: false,
+ render: (record: any) => {
+ let price = formatCurrency(calculateUnitPrice(record), {
+ currency: record.purchase_price_currency
+ });
+
+ let units = record.part_detail?.units;
+
+ return (
+
+ {price}
+ {units && [{units}] }
+
+ );
+ }
+ }
+ ];
+ }, []);
+
+ const currency: string = useMemo(() => {
+ if (table.records.length === 0) {
+ return '';
+ }
+ return table.records[0].purchase_price_currency;
+ }, [table.records]);
+
+ const purchaseHistoryData = useMemo(() => {
+ return table.records.map((record: any) => {
+ return {
+ quantity: record.quantity,
+ purchase_price: record.purchase_price,
+ unit_price: calculateUnitPrice(record),
+ name: record.order_detail.reference
+ };
+ });
+ }, [table.records]);
+
+ return (
+
+
+
+
+ formatCurrency(value, {
+ currency: currency
+ })?.toString() ?? ''
+ }
+ />
+ tooltipFormatter(label, currency)}
+ />
+
+
+ ) : (
+
+ );
+}
diff --git a/src/frontend/src/pages/part/pricing/SaleHistoryPanel.tsx b/src/frontend/src/pages/part/pricing/SaleHistoryPanel.tsx
new file mode 100644
index 0000000000..7a8b823866
--- /dev/null
+++ b/src/frontend/src/pages/part/pricing/SaleHistoryPanel.tsx
@@ -0,0 +1,124 @@
+import { t } from '@lingui/macro';
+import { SimpleGrid } from '@mantine/core';
+import { ReactNode, useMemo } from 'react';
+import {
+ Bar,
+ BarChart,
+ Legend,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis
+} from 'recharts';
+
+import { CHART_COLORS } from '../../../components/charts/colors';
+import { tooltipFormatter } from '../../../components/charts/tooltipFormatter';
+import { formatCurrency, renderDate } from '../../../defaults/formatters';
+import { ApiEndpoints } from '../../../enums/ApiEndpoints';
+import { useTable } from '../../../hooks/UseTable';
+import { apiUrl } from '../../../states/ApiState';
+import { TableColumn } from '../../../tables/Column';
+import { InvenTreeTable } from '../../../tables/InvenTreeTable';
+import { NoPricingData } from './PricingPanel';
+
+export default function SaleHistoryPanel({ part }: { part: any }): ReactNode {
+ const table = useTable('pricing-sale-history');
+
+ const columns: TableColumn[] = useMemo(() => {
+ return [
+ {
+ accessor: 'order',
+ title: t`Sale Order`,
+ render: (record: any) => record?.order_detail?.reference,
+ sortable: true,
+ switchable: false
+ },
+ {
+ accessor: 'customer',
+ title: t`Customer`,
+ sortable: true,
+ switchable: true,
+ render: (record: any) => record?.customer_detail?.name
+ },
+ {
+ accessor: 'shipment_date',
+ title: t`Date`,
+ sortable: false,
+ switchable: true,
+ render: (record: any) => renderDate(record.order_detail.shipment_date)
+ },
+ {
+ accessor: 'sale_price',
+ title: t`Sale Price`,
+ sortable: true,
+ switchable: false,
+ render: (record: any) => {
+ return formatCurrency(record.sale_price, {
+ currency: record.sale_price_currency
+ });
+ }
+ }
+ ];
+ }, []);
+
+ const currency: string = useMemo(() => {
+ if (table.records.length === 0) {
+ return '';
+ }
+ return table.records[0].sale_price_currency;
+ }, [table.records]);
+
+ const saleHistoryData = useMemo(() => {
+ return table.records.map((record: any) => {
+ return {
+ name: record.order_detail.reference,
+ sale_price: record.sale_price
+ };
+ });
+ }, [table.records]);
+
+ return (
+
+
+
+
+ formatCurrency(value, {
+ currency: currency
+ })?.toString() ?? ''
+ }
+ />
+ tooltipFormatter(label, currency)}
+ />
+
+
+ ) : (
+
+ );
+}
diff --git a/src/frontend/src/pages/part/pricing/SupplierPricingPanel.tsx b/src/frontend/src/pages/part/pricing/SupplierPricingPanel.tsx
new file mode 100644
index 0000000000..0cae3cb156
--- /dev/null
+++ b/src/frontend/src/pages/part/pricing/SupplierPricingPanel.tsx
@@ -0,0 +1,97 @@
+import { t } from '@lingui/macro';
+import { SimpleGrid } from '@mantine/core';
+import { useMemo } from 'react';
+import {
+ Bar,
+ BarChart,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis
+} from 'recharts';
+
+import { CHART_COLORS } from '../../../components/charts/colors';
+import { tooltipFormatter } from '../../../components/charts/tooltipFormatter';
+import { formatCurrency } from '../../../defaults/formatters';
+import { ApiEndpoints } from '../../../enums/ApiEndpoints';
+import { useTable } from '../../../hooks/UseTable';
+import { apiUrl } from '../../../states/ApiState';
+import { TableColumn } from '../../../tables/Column';
+import { InvenTreeTable } from '../../../tables/InvenTreeTable';
+import {
+ SupplierPriceBreakColumns,
+ calculateSupplierPartUnitPrice
+} from '../../../tables/purchasing/SupplierPriceBreakTable';
+import { NoPricingData } from './PricingPanel';
+
+export default function SupplierPricingPanel({ part }: { part: any }) {
+ const table = useTable('pricing-supplier');
+
+ const columns: TableColumn[] = useMemo(() => {
+ return SupplierPriceBreakColumns();
+ }, []);
+
+ const currency: string = useMemo(() => {
+ if (table.records.length === 0) {
+ return '';
+ }
+ return table.records[0].currency;
+ }, [table.records]);
+
+ const supplierPricingData = useMemo(() => {
+ return table.records.map((record: any) => {
+ return {
+ quantity: record.quantity,
+ supplier_price: record.price,
+ unit_price: calculateSupplierPartUnitPrice(record),
+ name: record.part_detail?.SKU
+ };
+ });
+ }, [table.records]);
+
+ return (
+
+
+
+
+ formatCurrency(value, {
+ currency: currency
+ })?.toString() ?? ''
+ }
+ />
+ tooltipFormatter(label, currency)}
+ />
+
+
+ ) : (
+
+ );
+}
diff --git a/src/frontend/src/pages/part/pricing/VariantPricingPanel.tsx b/src/frontend/src/pages/part/pricing/VariantPricingPanel.tsx
new file mode 100644
index 0000000000..b2af8c0bed
--- /dev/null
+++ b/src/frontend/src/pages/part/pricing/VariantPricingPanel.tsx
@@ -0,0 +1,134 @@
+import { t } from '@lingui/macro';
+import { SimpleGrid, Stack } from '@mantine/core';
+import { ReactNode, useMemo } from 'react';
+import {
+ Bar,
+ BarChart,
+ Legend,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis
+} from 'recharts';
+
+import { CHART_COLORS } from '../../../components/charts/colors';
+import { tooltipFormatter } from '../../../components/charts/tooltipFormatter';
+import { formatCurrency } from '../../../defaults/formatters';
+import { ApiEndpoints } from '../../../enums/ApiEndpoints';
+import { ModelType } from '../../../enums/ModelType';
+import { useTable } from '../../../hooks/UseTable';
+import { apiUrl } from '../../../states/ApiState';
+import { TableColumn } from '../../../tables/Column';
+import { DateColumn, PartColumn } from '../../../tables/ColumnRenderers';
+import { InvenTreeTable } from '../../../tables/InvenTreeTable';
+import { NoPricingData } from './PricingPanel';
+
+export default function VariantPricingPanel({
+ part,
+ pricing
+}: {
+ part: any;
+ pricing: any;
+}): ReactNode {
+ const table = useTable('pricing-variants');
+
+ const columns: TableColumn[] = useMemo(() => {
+ return [
+ {
+ accessor: 'name',
+ title: t`Variant Part`,
+ sortable: true,
+ switchable: false,
+ render: (record: any) => PartColumn(record, true)
+ },
+ {
+ accessor: 'pricing_min',
+ title: t`Minimum Price`,
+ sortable: true,
+ switchable: false,
+ render: (record: any) =>
+ formatCurrency(record.pricing_min, { currency: pricing?.currency })
+ },
+ {
+ accessor: 'pricing_max',
+ title: t`Maximum Price`,
+ sortable: true,
+ switchable: false,
+ render: (record: any) =>
+ formatCurrency(record.pricing_max, { currency: pricing?.currency })
+ },
+ DateColumn({
+ accessor: 'pricing_updated',
+ title: t`Updated`,
+ sortable: true,
+ switchable: true
+ })
+ ];
+ }, []);
+
+ // Calculate pricing data for the part variants
+ const variantPricingData: any[] = useMemo(() => {
+ const pricing = table.records.map((variant: any) => {
+ return {
+ part: variant,
+ name: variant.full_name,
+ pmin: variant.pricing_min ?? variant.pricing_max ?? 0,
+ pmax: variant.pricing_max ?? variant.pricing_min ?? 0
+ };
+ });
+
+ return pricing;
+ }, [table.records]);
+
+ return (
+
+
+
+
+
+ formatCurrency(value, {
+ currency: pricing?.currency
+ })?.toString() ?? ''
+ }
+ />
+
+ tooltipFormatter(label, pricing?.currency)
+ }
+ />
+
+
+ ) : (
+
+
+ );
+}
diff --git a/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx b/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx
index 74a4fb40aa..a982cf3b23 100644
--- a/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx
+++ b/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx
@@ -1,5 +1,5 @@
import { t } from '@lingui/macro';
-import { Grid, LoadingOverlay, Skeleton, Stack } from '@mantine/core';
+import { Grid, Group, LoadingOverlay, Skeleton, Stack } from '@mantine/core';
import {
IconDots,
IconInfoCircle,
@@ -8,7 +8,7 @@ import {
IconPackages,
IconPaperclip
} from '@tabler/icons-react';
-import { useMemo } from 'react';
+import { ReactNode, useMemo } from 'react';
import { useParams } from 'react-router-dom';
import { DetailsField, DetailsTable } from '../../components/details/Details';
@@ -25,11 +25,12 @@ import {
} from '../../components/items/ActionDropdown';
import { PageDetail } from '../../components/nav/PageDetail';
import { PanelGroup, PanelType } from '../../components/nav/PanelGroup';
+import { StatusRenderer } from '../../components/render/StatusRenderer';
import { NotesEditor } from '../../components/widgets/MarkdownEditor';
import { ApiEndpoints } from '../../enums/ApiEndpoints';
import { ModelType } from '../../enums/ModelType';
import { UserRoles } from '../../enums/Roles';
-import { purchaseOrderFields } from '../../forms/PurchaseOrderForms';
+import { usePurchaseOrderFields } from '../../forms/PurchaseOrderForms';
import { useEditApiFormModal } from '../../hooks/UseForm';
import { useInstance } from '../../hooks/UseInstance';
import { apiUrl } from '../../states/ApiState';
@@ -59,11 +60,13 @@ export default function PurchaseOrderDetail() {
refetchOnMount: true
});
+ const purchaseOrderFields = usePurchaseOrderFields();
+
const editPurchaseOrder = useEditApiFormModal({
url: ApiEndpoints.purchase_order_list,
pk: id,
title: t`Edit Purchase Order`,
- fields: purchaseOrderFields(),
+ fields: purchaseOrderFields,
onFormSuccess: () => {
refreshInstance();
}
@@ -226,7 +229,12 @@ export default function PurchaseOrderDetail() {
name: 'line-items',
label: t`Line Items`,
icon:
diff --git a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
index 4d951172bc..c54b7d085c 100644
--- a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
+++ b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
@@ -1,25 +1,35 @@
import { t } from '@lingui/macro';
import { Grid, LoadingOverlay, Skeleton, Stack } from '@mantine/core';
import {
+ IconDots,
IconInfoCircle,
IconList,
IconNotes,
IconPaperclip
} from '@tabler/icons-react';
-import { useMemo } from 'react';
+import { ReactNode, useMemo } from 'react';
import { useParams } from 'react-router-dom';
import { DetailsField, DetailsTable } from '../../components/details/Details';
import { DetailsImage } from '../../components/details/DetailsImage';
import { ItemDetailsGrid } from '../../components/details/ItemDetails';
+import {
+ ActionDropdown,
+ DeleteItemAction,
+ EditItemAction
+} from '../../components/items/ActionDropdown';
import { PageDetail } from '../../components/nav/PageDetail';
import { PanelGroup, PanelType } from '../../components/nav/PanelGroup';
+import { StatusRenderer } from '../../components/render/StatusRenderer';
import { NotesEditor } from '../../components/widgets/MarkdownEditor';
import { ApiEndpoints } from '../../enums/ApiEndpoints';
import { ModelType } from '../../enums/ModelType';
import { UserRoles } from '../../enums/Roles';
+import { useReturnOrderFields } from '../../forms/SalesOrderForms';
+import { useEditApiFormModal } from '../../hooks/UseForm';
import { useInstance } from '../../hooks/UseInstance';
import { apiUrl } from '../../states/ApiState';
+import { useUserState } from '../../states/UserState';
import { AttachmentTable } from '../../tables/general/AttachmentTable';
/**
@@ -28,7 +38,13 @@ import { AttachmentTable } from '../../tables/general/AttachmentTable';
export default function ReturnOrderDetail() {
const { id } = useParams();
- const { instance: order, instanceQuery } = useInstance({
+ const user = useUserState();
+
+ const {
+ instance: order,
+ instanceQuery,
+ refreshInstance
+ } = useInstance({
endpoint: ApiEndpoints.return_order_list,
pk: id,
params: {
@@ -220,14 +236,63 @@ export default function ReturnOrderDetail() {
];
}, [order, id]);
+ const orderBadges: ReactNode[] = useMemo(() => {
+ return instanceQuery.isLoading
+ ? []
+ : [
+
- Quantity: {stockitem.quantity ?? 'idk'}
-
- }
+ badges={stockBadges}
breadcrumbs={breadcrumbs}
breadcrumbAction={() => {
setTreeOpen(true);
@@ -462,6 +523,7 @@ export default function StockDetail() {
/>
()(
@@ -87,6 +91,15 @@ export const useLocalState = create()(
detailDrawerStack:
value === false ? 0 : get().detailDrawerStack + value
});
+ },
+ // navigation
+ navigationOpen: false,
+ setNavigationOpen: (value) => {
+ set({ navigationOpen: value });
+ },
+ allowMobile: false,
+ setAllowMobile: (value) => {
+ set({ allowMobile: value });
}
}),
{
diff --git a/src/frontend/src/states/SessionState.tsx b/src/frontend/src/states/SessionState.tsx
deleted file mode 100644
index 5ac12407d7..0000000000
--- a/src/frontend/src/states/SessionState.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { create } from 'zustand';
-import { createJSONStorage, persist } from 'zustand/middleware';
-
-import { setApiDefaults } from '../App';
-import { fetchGlobalStates } from './states';
-
-interface SessionStateProps {
- token?: string;
- setToken: (newToken?: string) => void;
- clearToken: () => void;
- hasToken: () => boolean;
-}
-
-/*
- * State manager for user login information.
- */
-export const useSessionState = create()(
- persist(
- (set, get) => ({
- token: undefined,
- clearToken: () => {
- set({ token: undefined });
- },
- setToken: (newToken) => {
- set({ token: newToken });
-
- setApiDefaults();
- fetchGlobalStates();
- },
- hasToken: () => !!get().token
- }),
- {
- name: 'session-state',
- storage: createJSONStorage(() => sessionStorage)
- }
- )
-);
diff --git a/src/frontend/src/states/SettingsState.tsx b/src/frontend/src/states/SettingsState.tsx
index 61aec8ff08..85fdba8ab3 100644
--- a/src/frontend/src/states/SettingsState.tsx
+++ b/src/frontend/src/states/SettingsState.tsx
@@ -5,9 +5,9 @@ import { create, createStore } from 'zustand';
import { api } from '../App';
import { ApiEndpoints } from '../enums/ApiEndpoints';
+import { isLoggedIn } from '../functions/auth';
import { isTrue } from '../functions/conversion';
import { PathParams, apiUrl } from './ApiState';
-import { useSessionState } from './SessionState';
import { Setting, SettingsLookup } from './states';
export interface SettingsStateProps {
@@ -29,7 +29,7 @@ export const useGlobalSettingsState = create(
lookup: {},
endpoint: ApiEndpoints.settings_global_list,
fetchSettings: async () => {
- if (!useSessionState.getState().hasToken()) {
+ if (!isLoggedIn()) {
return;
}
@@ -63,7 +63,7 @@ export const useUserSettingsState = create((set, get) => ({
lookup: {},
endpoint: ApiEndpoints.settings_user_list,
fetchSettings: async () => {
- if (!useSessionState.getState().hasToken()) {
+ if (!isLoggedIn()) {
return;
}
diff --git a/src/frontend/src/states/StatusState.tsx b/src/frontend/src/states/StatusState.tsx
index 51b31f851d..57e845f33a 100644
--- a/src/frontend/src/states/StatusState.tsx
+++ b/src/frontend/src/states/StatusState.tsx
@@ -6,8 +6,8 @@ import { StatusCodeListInterface } from '../components/render/StatusRenderer';
import { statusCodeList } from '../defaults/backendMappings';
import { ApiEndpoints } from '../enums/ApiEndpoints';
import { ModelType } from '../enums/ModelType';
+import { isLoggedIn } from '../functions/auth';
import { apiUrl } from './ApiState';
-import { useSessionState } from './SessionState';
type StatusLookup = Record;
@@ -24,7 +24,7 @@ export const useGlobalStatusState = create()(
setStatus: (newStatus: StatusLookup) => set({ status: newStatus }),
fetchStatus: async () => {
// Fetch status data for rendering labels
- if (!useSessionState.getState().hasToken()) {
+ if (!isLoggedIn()) {
return;
}
diff --git a/src/frontend/src/states/UserState.tsx b/src/frontend/src/states/UserState.tsx
index 621a5a5c82..35d8a82979 100644
--- a/src/frontend/src/states/UserState.tsx
+++ b/src/frontend/src/states/UserState.tsx
@@ -3,8 +3,8 @@ import { create } from 'zustand';
import { api } from '../App';
import { ApiEndpoints } from '../enums/ApiEndpoints';
import { UserPermissions, UserRoles } from '../enums/Roles';
+import { isLoggedIn } from '../functions/auth';
import { apiUrl } from './ApiState';
-import { useSessionState } from './SessionState';
import { UserProps } from './states';
interface UserStateProps {
@@ -37,7 +37,7 @@ export const useUserState = create((set, get) => ({
},
setUser: (newUser: UserProps) => set({ user: newUser }),
fetchUserState: async () => {
- if (!useSessionState.getState().hasToken()) {
+ if (!isLoggedIn()) {
return;
}
@@ -56,7 +56,7 @@ export const useUserState = create((set, get) => ({
};
set({ user: user });
})
- .catch((_error) => {
+ .catch((error) => {
console.error('Error fetching user data');
});
diff --git a/src/frontend/src/states/states.tsx b/src/frontend/src/states/states.tsx
index fba98fc4c6..0ec0139a14 100644
--- a/src/frontend/src/states/states.tsx
+++ b/src/frontend/src/states/states.tsx
@@ -1,6 +1,6 @@
import { setApiDefaults } from '../App';
+import { isLoggedIn } from '../functions/auth';
import { useServerApiState } from './ApiState';
-import { useSessionState } from './SessionState';
import { useGlobalSettingsState, useUserSettingsState } from './SettingsState';
import { useGlobalStatusState } from './StatusState';
import { useUserState } from './UserState';
@@ -126,7 +126,7 @@ export type SettingsLookup = {
* Necessary on login, or if locale is changed.
*/
export function fetchGlobalStates() {
- if (!useSessionState.getState().hasToken()) {
+ if (!isLoggedIn()) {
return;
}
diff --git a/src/frontend/src/tables/Column.tsx b/src/frontend/src/tables/Column.tsx
index de4d9ac5e7..dbd87a0e7d 100644
--- a/src/frontend/src/tables/Column.tsx
+++ b/src/frontend/src/tables/Column.tsx
@@ -8,7 +8,7 @@ export type TableColumn = {
sortable?: boolean; // Whether the column is sortable
switchable?: boolean; // Whether the column is switchable
hidden?: boolean; // Whether the column is hidden
- render?: (record: T) => any; // A custom render function
+ render?: (record: T, index?: number) => any; // A custom render function
filter?: any; // A custom filter function
filtering?: boolean; // Whether the column is filterable
width?: number; // The width of the column
diff --git a/src/frontend/src/tables/ColumnRenderers.tsx b/src/frontend/src/tables/ColumnRenderers.tsx
index a7f266e8da..f1d39858cf 100644
--- a/src/frontend/src/tables/ColumnRenderers.tsx
+++ b/src/frontend/src/tables/ColumnRenderers.tsx
@@ -16,8 +16,13 @@ import { TableColumn } from './Column';
import { ProjectCodeHoverCard } from './TableHoverCard';
// Render a Part instance within a table
-export function PartColumn(part: any) {
- return = {
onRowClick?: (record: T, index: number, event: any) => void;
onCellClick?: DataTableCellClickHandler;
modelType?: ModelType;
+ rowStyle?: (record: T, index: number) => any;
+ modelField?: string;
};
/**
@@ -151,6 +153,7 @@ export function InvenTreeTable({
queryKey: ['options', url, tableState.tableKey],
retry: 3,
refetchOnMount: true,
+ refetchOnWindowFocus: false,
queryFn: async () => {
return api
.options(url, {
@@ -515,18 +518,22 @@ export function InvenTreeTable({
if (props.onRowClick) {
// If a custom row click handler is provided, use that
props.onRowClick(record, index, event);
- } else if (tableProps.modelType && record?.pk) {
- // If a model type is provided, navigate to the detail view for that model
- let url = getDetailUrl(tableProps.modelType, record.pk);
+ } else if (tableProps.modelType) {
+ const pk = record?.[tableProps.modelField ?? 'pk'];
- // Should it be opened in a new tab?
- if (event?.ctrlKey || event?.shiftKey) {
- // Open in a new tab
- url = `/${base_url}${url}`;
- window.open(url, '_blank');
- } else {
- // Navigate internally
- navigate(url);
+ if (pk) {
+ // If a model type is provided, navigate to the detail view for that model
+ let url = getDetailUrl(tableProps.modelType, pk);
+
+ // Should it be opened in a new tab?
+ if (event?.ctrlKey || event?.shiftKey) {
+ // Open in a new tab
+ url = `/${base_url}${url}`;
+ window.open(url, '_blank');
+ } else {
+ // Navigate internally
+ navigate(url);
+ }
}
}
},
@@ -650,6 +657,7 @@ export function InvenTreeTable({
tableProps.enableSelection ? onSelectedRecordsChange : undefined
}
rowExpansion={tableProps.rowExpansion}
+ rowStyle={tableProps.rowStyle}
fetching={isFetching}
noRecordsText={missingRecordsText}
records={tableState.records}
diff --git a/src/frontend/src/tables/bom/BomTable.tsx b/src/frontend/src/tables/bom/BomTable.tsx
index b2101897dc..06e7603347 100644
--- a/src/frontend/src/tables/bom/BomTable.tsx
+++ b/src/frontend/src/tables/bom/BomTable.tsx
@@ -1,21 +1,26 @@
import { t } from '@lingui/macro';
-import { Text } from '@mantine/core';
+import { Group, Text } from '@mantine/core';
import {
IconArrowRight,
IconCircleCheck,
IconSwitch3
} from '@tabler/icons-react';
-import { ReactNode, useCallback, useMemo } from 'react';
+import { ReactNode, useCallback, useMemo, useState } from 'react';
import { useNavigate } from 'react-router-dom';
+import { AddItemButton } from '../../components/buttons/AddItemButton';
import { YesNoButton } from '../../components/buttons/YesNoButton';
import { Thumbnail } from '../../components/images/Thumbnail';
-import { formatPriceRange } from '../../defaults/formatters';
+import { formatDecimal, formatPriceRange } from '../../defaults/formatters';
import { ApiEndpoints } from '../../enums/ApiEndpoints';
import { ModelType } from '../../enums/ModelType';
import { UserRoles } from '../../enums/Roles';
import { bomItemFields } from '../../forms/BomForms';
-import { openDeleteApiForm, openEditApiForm } from '../../functions/forms';
+import {
+ useCreateApiFormModal,
+ useDeleteApiFormModal,
+ useEditApiFormModal
+} from '../../hooks/UseForm';
import { useTable } from '../../hooks/UseTable';
import { apiUrl } from '../../states/ApiState';
import { useUserState } from '../../states/UserState';
@@ -98,9 +103,19 @@ export function BomTable({
{
accessor: 'quantity',
switchable: false,
- sortable: true
- // TODO: Custom quantity renderer
- // TODO: see bom.js for existing implementation
+ sortable: true,
+ render: (record: any) => {
+ let quantity = formatDecimal(record.quantity);
+ let units = record.sub_part_detail?.units;
+
+ return (
+
+ {quantity}
+ {record.overage && +{record.overage} }
+ {units && {units} }
+
+ );
+ }
},
{
accessor: 'substitutes',
@@ -131,12 +146,22 @@ export function BomTable({
}),
{
accessor: 'price_range',
- title: t`Price Range`,
-
- sortable: false,
+ title: t`Unit Price`,
+ ordering: 'pricing_max',
+ sortable: true,
+ switchable: true,
render: (record: any) =>
formatPriceRange(record.pricing_min, record.pricing_max)
},
+ {
+ accessor: 'total_price',
+ title: t`Total Price`,
+ ordering: 'pricing_max_total',
+ sortable: true,
+ switchable: true,
+ render: (record: any) =>
+ formatPriceRange(record.pricing_min_total, record.pricing_max_total)
+ },
{
accessor: 'available_stock',
sortable: true,
@@ -269,6 +294,36 @@ export function BomTable({
];
}, [partId, params]);
+ const [selectedBomItem, setSelectedBomItem] = useState(0);
+
+ const newBomItem = useCreateApiFormModal({
+ url: ApiEndpoints.bom_list,
+ title: t`Create BOM Item`,
+ fields: bomItemFields(),
+ initialData: {
+ part: partId
+ },
+ successMessage: t`BOM item created`,
+ onFormSuccess: table.refreshTable
+ });
+
+ const editBomItem = useEditApiFormModal({
+ url: ApiEndpoints.bom_list,
+ pk: selectedBomItem,
+ title: t`Edit BOM Item`,
+ fields: bomItemFields(),
+ successMessage: t`BOM item updated`,
+ onFormSuccess: table.refreshTable
+ });
+
+ const deleteBomItem = useDeleteApiFormModal({
+ url: ApiEndpoints.bom_list,
+ pk: selectedBomItem,
+ title: t`Delete BOM Item`,
+ successMessage: t`BOM item deleted`,
+ onFormSuccess: table.refreshTable
+ });
+
const rowActions = useCallback(
(record: any) => {
// If this BOM item is defined for a *different* parent, then it cannot be edited
@@ -305,14 +360,8 @@ export function BomTable({
RowEditAction({
hidden: !user.hasChangeRole(UserRoles.part),
onClick: () => {
- openEditApiForm({
- url: ApiEndpoints.bom_list,
- pk: record.pk,
- title: t`Edit Bom Item`,
- fields: bomItemFields(),
- successMessage: t`Bom item updated`,
- onFormSuccess: table.refreshTable
- });
+ setSelectedBomItem(record.pk);
+ editBomItem.open();
}
})
);
@@ -322,14 +371,8 @@ export function BomTable({
RowDeleteAction({
hidden: !user.hasDeleteRole(UserRoles.part),
onClick: () => {
- openDeleteApiForm({
- url: ApiEndpoints.bom_list,
- pk: record.pk,
- title: t`Delete Bom Item`,
- successMessage: t`Bom item deleted`,
- onFormSuccess: table.refreshTable,
- preFormWarning: t`Are you sure you want to remove this BOM item?`
- });
+ setSelectedBomItem(record.pk);
+ deleteBomItem.open();
}
})
);
@@ -339,22 +382,38 @@ export function BomTable({
[partId, user]
);
+ const tableActions = useMemo(() => {
+ return [
+ newBomItem.open()}
+ />
+ ];
+ }, [user]);
+
return (
-
+ {quantity}
+ {units && {units} }
+
+ );
}
},
ReferenceColumn()
@@ -83,7 +92,8 @@ export function UsedInTable({
sub_part_detail: true
},
tableFilters: tableFilters,
- modelType: ModelType.part
+ modelType: ModelType.part,
+ modelField: 'part'
}}
/>
);
diff --git a/src/frontend/src/tables/build/BuildOrderTable.tsx b/src/frontend/src/tables/build/BuildOrderTable.tsx
index 66a15af959..19f9438380 100644
--- a/src/frontend/src/tables/build/BuildOrderTable.tsx
+++ b/src/frontend/src/tables/build/BuildOrderTable.tsx
@@ -10,7 +10,7 @@ import { renderDate } from '../../defaults/formatters';
import { ApiEndpoints } from '../../enums/ApiEndpoints';
import { ModelType } from '../../enums/ModelType';
import { UserRoles } from '../../enums/Roles';
-import { buildOrderFields } from '../../forms/BuildForms';
+import { useBuildOrderFields } from '../../forms/BuildForms';
import { getDetailUrl } from '../../functions/urls';
import { useCreateApiFormModal } from '../../hooks/UseForm';
import { useTable } from '../../hooks/UseTable';
@@ -135,10 +135,12 @@ export function BuildOrderTable({
const table = useTable('buildorder');
+ const buildOrderFields = useBuildOrderFields({ create: true });
+
const newBuild = useCreateApiFormModal({
url: ApiEndpoints.build_order_list,
title: t`Add Build Order`,
- fields: buildOrderFields(),
+ fields: buildOrderFields,
initialData: {
part: partId,
sales_order: salesOrderId,
diff --git a/src/frontend/src/tables/company/CompanyTable.tsx b/src/frontend/src/tables/company/CompanyTable.tsx
index 82cef9f7f5..9199a2248c 100644
--- a/src/frontend/src/tables/company/CompanyTable.tsx
+++ b/src/frontend/src/tables/company/CompanyTable.tsx
@@ -1,5 +1,6 @@
import { t } from '@lingui/macro';
import { Group, Text } from '@mantine/core';
+import { access } from 'fs';
import { useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
@@ -13,7 +14,8 @@ import { useCreateApiFormModal } from '../../hooks/UseForm';
import { useTable } from '../../hooks/UseTable';
import { apiUrl } from '../../states/ApiState';
import { useUserState } from '../../states/UserState';
-import { DescriptionColumn } from '../ColumnRenderers';
+import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers';
+import { TableFilter } from '../Filter';
import { InvenTreeTable } from '../InvenTreeTable';
/**
@@ -51,6 +53,12 @@ export function CompanyTable({
}
},
DescriptionColumn({}),
+ BooleanColumn({
+ accessor: 'active',
+ title: t`Active`,
+ sortable: true,
+ switchable: true
+ }),
{
accessor: 'website',
sortable: false
@@ -73,6 +81,31 @@ export function CompanyTable({
}
});
+ const tableFilters: TableFilter[] = useMemo(() => {
+ return [
+ {
+ name: 'active',
+ label: t`Active`,
+ description: t`Show active companies`
+ },
+ {
+ name: 'is_supplier',
+ label: t`Supplier`,
+ description: t`Show companies which are suppliers`
+ },
+ {
+ name: 'is_manufacturer',
+ label: t`Manufacturer`,
+ description: t`Show companies which are manufacturers`
+ },
+ {
+ name: 'is_customer',
+ label: t`Customer`,
+ description: t`Show companies which are customers`
+ }
+ ];
+ }, []);
+
const tableActions = useMemo(() => {
const can_add =
user.hasAddRole(UserRoles.purchase_order) ||
@@ -98,6 +131,7 @@ export function CompanyTable({
params: {
...params
},
+ tableFilters: tableFilters,
tableActions: tableActions,
onRowClick: (row: any) => {
if (row.pk) {
diff --git a/src/frontend/src/tables/company/ContactTable.tsx b/src/frontend/src/tables/company/ContactTable.tsx
index 6641131e39..83e4e6ebf8 100644
--- a/src/frontend/src/tables/company/ContactTable.tsx
+++ b/src/frontend/src/tables/company/ContactTable.tsx
@@ -63,9 +63,7 @@ export function ContactTable({
};
}, []);
- const [selectedContact, setSelectedContact] = useState(
- undefined
- );
+ const [selectedContact, setSelectedContact] = useState(0);
const editContact = useEditApiFormModal({
url: ApiEndpoints.contact_list,
diff --git a/src/frontend/src/tables/part/ParametricPartTable.tsx b/src/frontend/src/tables/part/ParametricPartTable.tsx
index ee2baa620f..ec53ab9ba7 100644
--- a/src/frontend/src/tables/part/ParametricPartTable.tsx
+++ b/src/frontend/src/tables/part/ParametricPartTable.tsx
@@ -132,6 +132,7 @@ export default function ParametricPartTable({
url: ApiEndpoints.part_parameter_list,
title: t`Add Part Parameter`,
fields: partParameterFields,
+ focus: 'data',
onFormSuccess: (parameter: any) => {
updateParameterRecord(selectedPart, parameter);
},
@@ -146,6 +147,7 @@ export default function ParametricPartTable({
title: t`Edit Part Parameter`,
pk: selectedParameter,
fields: partParameterFields,
+ focus: 'data',
onFormSuccess: (parameter: any) => {
updateParameterRecord(selectedPart, parameter);
}
@@ -234,6 +236,10 @@ export default function ParametricPartTable({
{
accessor: 'IPN',
sortable: true
+ },
+ {
+ accessor: 'total_in_stock',
+ sortable: true
}
];
diff --git a/src/frontend/src/tables/part/PartParameterTable.tsx b/src/frontend/src/tables/part/PartParameterTable.tsx
index 80e37fbb20..79f514686a 100644
--- a/src/frontend/src/tables/part/PartParameterTable.tsx
+++ b/src/frontend/src/tables/part/PartParameterTable.tsx
@@ -95,7 +95,9 @@ export function PartParameterTable({ partId }: { partId: any }) {
const partParameterFields: ApiFormFieldSet = useMemo(() => {
return {
- part: {},
+ part: {
+ disabled: true
+ },
template: {},
data: {}
};
@@ -105,6 +107,7 @@ export function PartParameterTable({ partId }: { partId: any }) {
url: ApiEndpoints.part_parameter_list,
title: t`New Part Parameter`,
fields: partParameterFields,
+ focus: 'template',
initialData: {
part: partId
},
diff --git a/src/frontend/src/tables/part/PartTable.tsx b/src/frontend/src/tables/part/PartTable.tsx
index 856e88524b..f9d46cad23 100644
--- a/src/frontend/src/tables/part/PartTable.tsx
+++ b/src/frontend/src/tables/part/PartTable.tsx
@@ -158,7 +158,8 @@ function partTableColumns(): TableColumn[] {
{
accessor: 'price_range',
title: t`Price Range`,
- sortable: false,
+ sortable: true,
+ ordering: 'pricing_max',
render: (record: any) =>
formatPriceRange(record.pricing_min, record.pricing_max)
},
diff --git a/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx b/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx
index ecac9aef13..9f85529353 100644
--- a/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx
+++ b/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx
@@ -44,9 +44,11 @@ import { TableHoverCard } from '../TableHoverCard';
*/
export function PurchaseOrderLineItemTable({
orderId,
+ supplierId,
params
}: {
orderId: number;
+ supplierId?: number;
params?: any;
}) {
const table = useTable('purchase-order-line-item');
@@ -67,7 +69,7 @@ export function PurchaseOrderLineItemTable({
return [
{
accessor: 'part',
- title: t`Part`,
+ title: t`Internal Part`,
sortable: true,
switchable: false,
render: (record: any) => {
@@ -183,25 +185,35 @@ export function PurchaseOrderLineItemTable({
];
}, [orderId, user]);
+ const addPurchaseOrderFields = usePurchaseOrderLineItemFields({
+ create: true,
+ orderId: orderId,
+ supplierId: supplierId
+ });
+
+ const [initialData, setInitialData] = useState({});
+
const newLine = useCreateApiFormModal({
url: ApiEndpoints.purchase_order_line_list,
title: t`Add Line Item`,
- fields: usePurchaseOrderLineItemFields({ create: true }),
- initialData: {
- order: orderId
- },
+ fields: addPurchaseOrderFields,
+ initialData: initialData,
onFormSuccess: table.refreshTable
});
- const [selectedLine, setSelectedLine] = useState(
- undefined
- );
+ const [selectedLine, setSelectedLine] = useState(0);
+
+ const editPurchaseOrderFields = usePurchaseOrderLineItemFields({
+ create: false,
+ orderId: orderId,
+ supplierId: supplierId
+ });
const editLine = useEditApiFormModal({
url: ApiEndpoints.purchase_order_line_list,
pk: selectedLine,
title: t`Edit Line Item`,
- fields: usePurchaseOrderLineItemFields({}),
+ fields: editPurchaseOrderFields,
onFormSuccess: table.refreshTable
});
@@ -235,7 +247,11 @@ export function PurchaseOrderLineItemTable({
}
}),
RowDuplicateAction({
- hidden: !user.hasAddRole(UserRoles.purchase_order)
+ hidden: !user.hasAddRole(UserRoles.purchase_order),
+ onClick: () => {
+ setInitialData({ ...record });
+ newLine.open();
+ }
}),
RowDeleteAction({
hidden: !user.hasDeleteRole(UserRoles.purchase_order),
@@ -254,7 +270,12 @@ export function PurchaseOrderLineItemTable({
return [
newLine.open()}
+ onClick={() => {
+ setInitialData({
+ order: orderId
+ });
+ newLine.open();
+ }}
hidden={!user?.hasAddRole(UserRoles.purchase_order)}
/>,
{
+ return formatCurrency(record.total_price, {
+ currency: record.order_currency ?? record.supplier_detail?.currency
+ });
+ }
+ },
ResponsibleColumn()
];
}, []);
+ const purchaseOrderFields = usePurchaseOrderFields();
+
const newPurchaseOrder = useCreateApiFormModal({
url: ApiEndpoints.purchase_order_list,
title: t`Add Purchase Order`,
- fields: purchaseOrderFields(),
+ fields: purchaseOrderFields,
initialData: {
supplier: supplierId
},
diff --git a/src/frontend/src/tables/purchasing/SupplierPartTable.tsx b/src/frontend/src/tables/purchasing/SupplierPartTable.tsx
index 9bc820c4a3..70de5f778c 100644
--- a/src/frontend/src/tables/purchasing/SupplierPartTable.tsx
+++ b/src/frontend/src/tables/purchasing/SupplierPartTable.tsx
@@ -1,6 +1,6 @@
import { t } from '@lingui/macro';
import { Text } from '@mantine/core';
-import { ReactNode, useCallback, useMemo } from 'react';
+import { ReactNode, useCallback, useMemo, useState } from 'react';
import { AddItemButton } from '../../components/buttons/AddItemButton';
import { Thumbnail } from '../../components/images/Thumbnail';
@@ -9,17 +9,23 @@ import { ModelType } from '../../enums/ModelType';
import { UserRoles } from '../../enums/Roles';
import { useSupplierPartFields } from '../../forms/CompanyForms';
import { openDeleteApiForm, openEditApiForm } from '../../functions/forms';
-import { useCreateApiFormModal } from '../../hooks/UseForm';
+import {
+ useCreateApiFormModal,
+ useDeleteApiFormModal,
+ useEditApiFormModal
+} from '../../hooks/UseForm';
import { useTable } from '../../hooks/UseTable';
import { apiUrl } from '../../states/ApiState';
import { useUserState } from '../../states/UserState';
import { TableColumn } from '../Column';
import {
+ BooleanColumn,
DescriptionColumn,
LinkColumn,
NoteColumn,
PartColumn
} from '../ColumnRenderers';
+import { TableFilter } from '../Filter';
import { InvenTreeTable } from '../InvenTreeTable';
import { RowDeleteAction, RowEditAction } from '../RowActions';
import { TableHoverCard } from '../TableHoverCard';
@@ -88,6 +94,12 @@ export function SupplierPartTable({ params }: { params: any }): ReactNode {
title: t`MPN`,
render: (record: any) => record?.manufacturer_part_detail?.MPN
},
+ BooleanColumn({
+ accessor: 'active',
+ title: t`Active`,
+ sortable: true,
+ switchable: true
+ }),
{
accessor: 'in_stock',
sortable: true
@@ -145,35 +157,67 @@ export function SupplierPartTable({ params }: { params: any }): ReactNode {
];
}, [params]);
- const addSupplierPartFields = useSupplierPartFields({
- partPk: params?.part,
- supplierPk: params?.supplier,
- hidePart: true
+ const supplierPartFields = useSupplierPartFields();
+
+ const addSupplierPart = useCreateApiFormModal({
+ url: ApiEndpoints.supplier_part_list,
+ title: t`Add Supplier Part`,
+ fields: supplierPartFields,
+ initialData: {
+ part: params?.part,
+ supplier: params?.supplier
+ },
+ onFormSuccess: table.refreshTable,
+ successMessage: t`Supplier part created`
});
- const { modal: addSupplierPartModal, open: openAddSupplierPartForm } =
- useCreateApiFormModal({
- url: ApiEndpoints.supplier_part_list,
- title: t`Add Supplier Part`,
- fields: addSupplierPartFields,
- onFormSuccess: table.refreshTable,
- successMessage: t`Supplier part created`
- });
- // Table actions
const tableActions = useMemo(() => {
- // TODO: Hide actions based on user permissions
-
return [
addSupplierPart.open()}
+ hidden={!user.hasAddRole(UserRoles.purchase_order)}
/>
];
}, [user]);
- const editSupplierPartFields = useSupplierPartFields({
- hidePart: true,
- partPk: params?.part
+ const tableFilters: TableFilter[] = useMemo(() => {
+ return [
+ {
+ name: 'active',
+ label: t`Active`,
+ description: t`Show active supplier parts`
+ },
+ {
+ name: 'part_active',
+ label: t`Active Part`,
+ description: t`Show active internal parts`
+ },
+ {
+ name: 'supplier_active',
+ label: t`Active Supplier`,
+ description: t`Show active suppliers`
+ }
+ ];
+ }, []);
+
+ const editSupplierPartFields = useSupplierPartFields();
+
+ const [selectedSupplierPart, setSelectedSupplierPart] = useState(0);
+
+ const editSupplierPart = useEditApiFormModal({
+ url: ApiEndpoints.supplier_part_list,
+ pk: selectedSupplierPart,
+ title: t`Edit Supplier Part`,
+ fields: editSupplierPartFields,
+ onFormSuccess: () => table.refreshTable()
+ });
+
+ const deleteSupplierPart = useDeleteApiFormModal({
+ url: ApiEndpoints.supplier_part_list,
+ pk: selectedSupplierPart,
+ title: t`Delete Supplier Part`,
+ onFormSuccess: () => table.refreshTable()
});
// Row action callback
@@ -183,29 +227,15 @@ export function SupplierPartTable({ params }: { params: any }): ReactNode {
RowEditAction({
hidden: !user.hasChangeRole(UserRoles.purchase_order),
onClick: () => {
- record.pk &&
- openEditApiForm({
- url: ApiEndpoints.supplier_part_list,
- pk: record.pk,
- title: t`Edit Supplier Part`,
- fields: editSupplierPartFields,
- onFormSuccess: table.refreshTable,
- successMessage: t`Supplier part updated`
- });
+ setSelectedSupplierPart(record.pk);
+ editSupplierPart.open();
}
}),
RowDeleteAction({
hidden: !user.hasDeleteRole(UserRoles.purchase_order),
onClick: () => {
- record.pk &&
- openDeleteApiForm({
- url: ApiEndpoints.supplier_part_list,
- pk: record.pk,
- title: t`Delete Supplier Part`,
- successMessage: t`Supplier part deleted`,
- onFormSuccess: table.refreshTable,
- preFormWarning: t`Are you sure you want to remove this supplier part?`
- });
+ setSelectedSupplierPart(record.pk);
+ deleteSupplierPart.open();
}
})
];
@@ -215,7 +245,9 @@ export function SupplierPartTable({ params }: { params: any }): ReactNode {
return (
<>
- {addSupplierPartModal}
+ {addSupplierPart.modal}
+ {editSupplierPart.modal}
+ {deleteSupplierPart.modal}
+ {record.supplier_detail?.name}
+
+ );
+ }
+ },
+ {
+ accessor: 'part_detail.SKU',
+ title: t`SKU`,
+ ordering: 'SKU',
+ sortable: true,
+ switchable: false,
+ render: (record: any) => {
+ return (
+
+ {record.part_detail.SKU}
+
+ );
+ }
+ },
+ {
+ accessor: 'quantity',
+ title: t`Quantity`,
+ sortable: true,
+ switchable: false
+ },
+ {
+ accessor: 'price',
+ title: t`Supplier Price`,
+ render: (record: any) =>
+ formatCurrency(record.price, { currency: record.price_currency }),
+ sortable: true,
+ switchable: false
+ },
+ {
+ accessor: 'unit_price',
+ ordering: 'price',
+ title: t`Unit Price`,
+ sortable: true,
+ switchable: true,
+ render: (record: any) => {
+ let units = record.part_detail?.pack_quantity;
+
+ let price = formatCurrency(calculateSupplierPartUnitPrice(record), {
+ currency: record.price_currency
+ });
+
+ return (
+
+ {price}
+ {units && [{units}] }
+
+ );
+ }
+ }
+ ];
+}
+
+export default function SupplierPriceBreakTable({
+ supplierPartId
+}: {
+ supplierPartId: number;
+}) {
+ const table = useTable('supplierpricebreaks');
+
+ const user = useUserState();
+
+ const columns: TableColumn[] = useMemo(() => {
+ return SupplierPriceBreakColumns();
+ }, []);
+
+ const supplierPriceBreakFields: ApiFormFieldSet = useMemo(() => {
+ return {
+ part: {
+ hidden: false,
+ disabled: true
+ },
+ quantity: {},
+ price: {},
+ price_currency: {}
+ };
+ }, []);
+
+ const [selectedPriceBreak, setSelectedPriceBreak] = useState(0);
+
+ const newPriceBreak = useCreateApiFormModal({
+ url: apiUrl(ApiEndpoints.supplier_part_pricing_list),
+ title: t`Add Price Break`,
+ fields: supplierPriceBreakFields,
+ initialData: {
+ part: supplierPartId
+ },
+ onFormSuccess: (data: any) => {
+ table.refreshTable();
+ }
+ });
+
+ const editPriceBreak = useEditApiFormModal({
+ url: apiUrl(ApiEndpoints.supplier_part_pricing_list),
+ pk: selectedPriceBreak,
+ title: t`Edit Price Break`,
+ fields: supplierPriceBreakFields,
+ onFormSuccess: (data: any) => {
+ table.refreshTable();
+ }
+ });
+
+ const deletePriceBreak = useDeleteApiFormModal({
+ url: apiUrl(ApiEndpoints.supplier_part_pricing_list),
+ pk: selectedPriceBreak,
+ title: t`Delete Price Break`,
+ onFormSuccess: () => {
+ table.refreshTable();
+ }
+ });
+
+ const tableActions = useMemo(() => {
+ return [
+ {
+ newPriceBreak.open();
+ }}
+ hidden={!user.hasAddRole(UserRoles.part)}
+ />
+ ];
+ }, [user]);
+
+ const rowActions = useCallback(
+ (record: any) => {
+ return [
+ RowEditAction({
+ hidden: !user.hasChangeRole(UserRoles.purchase_order),
+ onClick: () => {
+ setSelectedPriceBreak(record.pk);
+ editPriceBreak.open();
+ }
+ }),
+ RowDeleteAction({
+ hidden: !user.hasDeleteRole(UserRoles.purchase_order),
+ onClick: () => {
+ setSelectedPriceBreak(record.pk);
+ deletePriceBreak.open();
+ }
+ })
+ ];
+ },
+ [user]
+ );
+
+ return (
+ <>
+ {newPriceBreak.modal}
+ {editPriceBreak.modal}
+ {deletePriceBreak.modal}
+ newReturnOrder.open()}
+ hidden={!user.hasAddRole(UserRoles.return_order)}
/>
];
}, [user]);
return (
- newStockItem.open()}
/>
diff --git a/src/frontend/src/tables/stock/StockItemTestResultTable.tsx b/src/frontend/src/tables/stock/StockItemTestResultTable.tsx
index 8014e1a33b..0870771472 100644
--- a/src/frontend/src/tables/stock/StockItemTestResultTable.tsx
+++ b/src/frontend/src/tables/stock/StockItemTestResultTable.tsx
@@ -279,9 +279,7 @@ export default function StockItemTestResultTable({
successMessage: t`Test result added`
});
- const [selectedTest, setSelectedTest] = useState(
- undefined
- );
+ const [selectedTest, setSelectedTest] = useState(0);
const editTestModal = useEditApiFormModal({
url: ApiEndpoints.stock_test_result_list,
diff --git a/src/frontend/src/views/DesktopAppView.tsx b/src/frontend/src/views/DesktopAppView.tsx
index a48445272d..1ee5f84f2e 100644
--- a/src/frontend/src/views/DesktopAppView.tsx
+++ b/src/frontend/src/views/DesktopAppView.tsx
@@ -5,10 +5,10 @@ import { BrowserRouter } from 'react-router-dom';
import { queryClient } from '../App';
import { BaseContext } from '../contexts/BaseContext';
import { defaultHostList } from '../defaults/defaultHostList';
+import { isLoggedIn } from '../functions/auth';
import { base_url } from '../main';
import { routes } from '../router';
import { useLocalState } from '../states/LocalState';
-import { useSessionState } from '../states/SessionState';
import {
useGlobalSettingsState,
useUserSettingsState
@@ -28,20 +28,19 @@ export default function DesktopAppView() {
// Server Session
const [fetchedServerSession, setFetchedServerSession] = useState(false);
- const sessionState = useSessionState.getState();
- const [token] = sessionState.token ? [sessionState.token] : [null];
+
useEffect(() => {
if (Object.keys(hostList).length === 0) {
useLocalState.setState({ hostList: defaultHostList });
}
- if (token && !fetchedServerSession) {
+ if (isLoggedIn() && !fetchedServerSession) {
setFetchedServerSession(true);
fetchUserState();
fetchGlobalSettings();
fetchUserSettings();
}
- }, [token, fetchedServerSession]);
+ }, [fetchedServerSession]);
return (
diff --git a/src/frontend/src/views/MainView.tsx b/src/frontend/src/views/MainView.tsx
index 1233038d37..33535757b5 100644
--- a/src/frontend/src/views/MainView.tsx
+++ b/src/frontend/src/views/MainView.tsx
@@ -3,6 +3,7 @@ import { lazy, useEffect } from 'react';
import { setApiDefaults } from '../App';
import { Loadable } from '../functions/loading';
+import { useLocalState } from '../states/LocalState';
function checkMobile() {
const { height, width } = useViewportSize();
@@ -15,6 +16,7 @@ const DesktopAppView = Loadable(lazy(() => import('./DesktopAppView')));
// Main App
export default function MainView() {
+ const [allowMobile] = useLocalState((state) => [state.allowMobile]);
// Set initial login status
useEffect(() => {
// Local state initialization
@@ -22,7 +24,7 @@ export default function MainView() {
}, []);
// Check if mobile
- if (checkMobile()) {
+ if (!allowMobile && checkMobile()) {
return
@@ -22,6 +30,11 @@ export default function MobileAppView() {
Read the docs
+ {IS_DEV && (
+
+ Ignore and continue to Desktop view
+
+ )}
diff --git a/src/frontend/tests/baseFixtures.ts b/src/frontend/tests/baseFixtures.ts
index e9aec65fb8..f22e0dd9ea 100644
--- a/src/frontend/tests/baseFixtures.ts
+++ b/src/frontend/tests/baseFixtures.ts
@@ -1,10 +1,19 @@
import { test as baseTest } from '@playwright/test';
import * as crypto from 'crypto';
import * as fs from 'fs';
+import os from 'os';
import * as path from 'path';
const istanbulCLIOutput = path.join(process.cwd(), '.nyc_output');
-export const classicUrl = 'http://127.0.0.1:8000';
+let platform = os.platform();
+let systemKeyVar;
+if (platform === 'darwin') {
+ systemKeyVar = 'Meta';
+} else {
+ systemKeyVar = 'Control';
+}
+/* metaKey is the local action key (used for spotlight for example) */
+export const systemKey = systemKeyVar;
export function generateUUID(): string {
return crypto.randomBytes(16).toString('hex');
diff --git a/src/frontend/tests/classic.spec.ts b/src/frontend/tests/cui.spec.ts
similarity index 60%
rename from src/frontend/tests/classic.spec.ts
rename to src/frontend/tests/cui.spec.ts
index f2418d60c7..66f705f25d 100644
--- a/src/frontend/tests/classic.spec.ts
+++ b/src/frontend/tests/cui.spec.ts
@@ -1,23 +1,22 @@
import { expect, test } from '@playwright/test';
-import { classicUrl } from './baseFixtures';
+import { classicUrl, user } from './defaults';
test('CUI - Index', async ({ page }) => {
await page.goto(`${classicUrl}/api/`);
- await page.goto(`${classicUrl}/index/`);
- await expect(page).toHaveTitle('InvenTree Demo Server | Sign In');
- await expect(
- page.getByRole('heading', { name: 'InvenTree Demo Server' })
- ).toBeVisible();
+ await page.goto(`${classicUrl}/index/`, { timeout: 10000 });
+ console.log('Page title:', await page.title());
+ await expect(page).toHaveTitle(RegExp('^InvenTree.*Sign In$'));
+ await expect(page.getByRole('heading', { name: 'Sign In' })).toBeVisible();
- await page.getByLabel('username').fill('allaccess');
- await page.getByLabel('password').fill('nolimits');
+ await page.getByLabel('username').fill(user.username);
+ await page.getByLabel('password').fill(user.password);
await page.click('button', { text: 'Sign In' });
await page.waitForURL('**/index/');
await page.waitForLoadState('networkidle');
await expect(page).toHaveTitle('InvenTree Demo Server | Index');
- await expect(page.getByRole('button', { name: 'allaccess' })).toBeVisible();
+ await expect(page.getByRole('button', { name: user.username })).toBeVisible();
await expect(
page.getByRole('link', { name: 'Parts', exact: true })
).toBeVisible();
diff --git a/src/frontend/tests/defaults.ts b/src/frontend/tests/defaults.ts
new file mode 100644
index 0000000000..3ceaa5b9fa
--- /dev/null
+++ b/src/frontend/tests/defaults.ts
@@ -0,0 +1,17 @@
+export const classicUrl = 'http://127.0.0.1:8000';
+
+export const baseUrl = `${classicUrl}/platform`;
+export const loginUrl = `${baseUrl}/login`;
+export const logoutUrl = `${baseUrl}/logout`;
+export const homeUrl = `${baseUrl}/home`;
+
+export const user = {
+ name: 'Ally Access',
+ username: 'allaccess',
+ password: 'nolimits'
+};
+
+export const adminuser = {
+ username: 'admin',
+ password: 'inventree'
+};
diff --git a/src/frontend/tests/login.ts b/src/frontend/tests/login.ts
new file mode 100644
index 0000000000..a8165c4f61
--- /dev/null
+++ b/src/frontend/tests/login.ts
@@ -0,0 +1,37 @@
+import { expect } from './baseFixtures.js';
+import { baseUrl, loginUrl, logoutUrl, user } from './defaults';
+
+/*
+ * Perform form based login operation from the "login" URL
+ */
+export const doLogin = async (page, username?: string, password?: string) => {
+ username = username ?? user.username;
+ password = password ?? user.password;
+
+ await page.goto(logoutUrl);
+ await page.goto(loginUrl);
+ await expect(page).toHaveTitle(RegExp('^InvenTree.*$'));
+ await page.waitForURL('**/platform/login');
+ await page.getByLabel('username').fill(username);
+ await page.getByLabel('password').fill(password);
+ await page.getByRole('button', { name: 'Log in' }).click();
+ await page.waitForURL('**/platform/home');
+ await page.waitForTimeout(250);
+};
+
+/*
+ * Perform a quick login based on passing URL parameters
+ */
+export const doQuickLogin = async (
+ page,
+ username?: string,
+ password?: string
+) => {
+ username = username ?? user.username;
+ password = password ?? user.password;
+
+ // await page.goto(logoutUrl);
+ await page.goto(`${baseUrl}/login/?login=${username}&password=${password}`);
+ await page.waitForURL('**/platform/home');
+ await page.waitForTimeout(250);
+};
diff --git a/src/frontend/tests/pui_basic.spec.ts b/src/frontend/tests/pui_basic.spec.ts
new file mode 100644
index 0000000000..eadb2187b4
--- /dev/null
+++ b/src/frontend/tests/pui_basic.spec.ts
@@ -0,0 +1,37 @@
+import { expect, test } from './baseFixtures.js';
+import { baseUrl, loginUrl, logoutUrl, user } from './defaults.js';
+import { doLogin, doQuickLogin } from './login.js';
+
+test('PUI - Basic Login Test', async ({ page }) => {
+ await doLogin(page);
+
+ // Check that the username is provided
+ await page.getByText(user.username);
+
+ await expect(page).toHaveTitle(RegExp('^InvenTree'));
+
+ // Go to the dashboard
+ await page.goto(baseUrl);
+ await page.waitForURL('**/platform');
+
+ await page
+ .getByRole('heading', { name: `Welcome to your Dashboard, ${user.name}` })
+ .click();
+});
+
+test('PUI - Quick Login Test', async ({ page }) => {
+ await doQuickLogin(page);
+
+ // Check that the username is provided
+ await page.getByText(user.username);
+
+ await expect(page).toHaveTitle(RegExp('^InvenTree'));
+
+ // Go to the dashboard
+ await page.goto(baseUrl);
+ await page.waitForURL('**/platform');
+
+ await page
+ .getByRole('heading', { name: `Welcome to your Dashboard, ${user.name}` })
+ .click();
+});
diff --git a/src/frontend/tests/pui_command.spec.ts b/src/frontend/tests/pui_command.spec.ts
new file mode 100644
index 0000000000..f722d04bba
--- /dev/null
+++ b/src/frontend/tests/pui_command.spec.ts
@@ -0,0 +1,122 @@
+import { systemKey, test } from './baseFixtures.js';
+import { baseUrl } from './defaults.js';
+import { doQuickLogin } from './login.js';
+
+test('PUI - Quick Command', async ({ page }) => {
+ await doQuickLogin(page);
+
+ // Open Spotlight with Keyboard Shortcut
+ await page.locator('body').press(`${systemKey}+k`);
+ await page.waitForTimeout(200);
+ await page.getByRole('tab', { name: 'Dashboard' }).click();
+ await page
+ .locator('div')
+ .filter({ hasText: /^Dashboard$/ })
+ .click();
+ await page.waitForURL('**/platform/dashboard');
+
+ // Open Spotlight with Button
+ await page.getByRole('button', { name: 'Open spotlight' }).click();
+ await page.getByRole('button', { name: 'Home Go to the home page' }).click();
+ await page
+ .getByRole('heading', { name: 'Welcome to your Dashboard,' })
+ .click();
+ await page.waitForURL('**/platform');
+
+ // Open Spotlight with Keyboard Shortcut and Search
+ await page.locator('body').press(`${systemKey}+k`);
+ await page.waitForTimeout(200);
+ await page.getByPlaceholder('Search...').fill('Dashboard');
+ await page.getByPlaceholder('Search...').press('Tab');
+ await page.getByPlaceholder('Search...').press('Enter');
+ await page.waitForURL('**/platform/dashboard');
+});
+
+test('PUI - Quick Command - No Keys', async ({ page }) => {
+ await doQuickLogin(page);
+
+ // Open Spotlight with Button
+ await page.getByRole('button', { name: 'Open spotlight' }).click();
+ await page.getByRole('button', { name: 'Home Go to the home page' }).click();
+ await page
+ .getByRole('heading', { name: 'Welcome to your Dashboard,' })
+ .click();
+ await page.waitForURL('**/platform');
+
+ // Use navigation menu
+ await page.getByRole('button', { name: 'Open spotlight' }).click();
+ await page
+ .getByRole('button', { name: 'Open Navigation Open the main' })
+ .click();
+ // assert the nav headers are visible
+ await page.getByRole('heading', { name: 'Navigation' }).waitFor();
+ await page.getByRole('heading', { name: 'Pages' }).waitFor();
+ await page.getByRole('heading', { name: 'Documentation' }).waitFor();
+ await page.getByRole('heading', { name: 'About' }).waitFor();
+
+ await page.keyboard.press('Escape');
+
+ // use server info
+ await page.getByRole('button', { name: 'Open spotlight' }).click();
+ await page
+ .getByRole('button', {
+ name: 'Server Information About this Inventree instance'
+ })
+ .click();
+ await page.getByRole('cell', { name: 'Instance Name' }).waitFor();
+ await page.getByRole('button', { name: 'Dismiss' }).click();
+
+ await page.waitForURL('**/platform');
+
+ // use license info
+ await page.getByRole('button', { name: 'Open spotlight' }).click();
+ await page
+ .getByRole('button', {
+ name: 'License Information Licenses for dependencies of the service'
+ })
+ .click();
+ await page.getByText('License Information').first().waitFor();
+ await page.getByRole('tab', { name: 'backend Packages' }).waitFor();
+
+ await page.getByLabel('License Information').getByRole('button').click();
+
+ // use about
+ await page.getByRole('button', { name: 'Open spotlight' }).click();
+ await page
+ .getByRole('button', { name: 'About InvenTree About the InvenTree org' })
+ .click();
+ await page.getByText('This information is only').waitFor();
+
+ await page.getByLabel('About InvenTree').getByRole('button').click();
+
+ // use documentation
+ await page.getByRole('button', { name: 'Open spotlight' }).click();
+ await page
+ .getByRole('button', {
+ name: 'Documentation Visit the documentation to learn more about InvenTree'
+ })
+ .click();
+ await page.waitForURL('https://docs.inventree.org/**');
+
+ // Test addition of new actions
+ await page.goto(`${baseUrl}/playground`);
+ await page
+ .locator('div')
+ .filter({ hasText: /^Playground$/ })
+ .waitFor();
+ await page.getByRole('button', { name: 'Spotlight actions' }).click();
+ await page.getByRole('button', { name: 'Register extra actions' }).click();
+ await page.getByPlaceholder('Search...').fill('secret');
+ await page.getByRole('button', { name: 'Secret action It was' }).click();
+ await page.getByRole('button', { name: 'Open spotlight' }).click();
+ await page.getByPlaceholder('Search...').fill('Another secret action');
+ await page
+ .getByRole('button', {
+ name: 'Another secret action You can register multiple actions with just one command'
+ })
+ .click();
+ await page.getByRole('tab', { name: 'Home' }).click();
+ await page.getByRole('button', { name: 'Open spotlight' }).click();
+ await page.getByPlaceholder('Search...').fill('secret');
+ await page.getByText('Nothing found...').click();
+});
diff --git a/src/frontend/tests/pui_general.spec.ts b/src/frontend/tests/pui_general.spec.ts
new file mode 100644
index 0000000000..3dead1ce79
--- /dev/null
+++ b/src/frontend/tests/pui_general.spec.ts
@@ -0,0 +1,241 @@
+import { expect, test } from './baseFixtures.js';
+import { baseUrl } from './defaults.js';
+import { doQuickLogin } from './login.js';
+
+test('PUI - Parts', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.goto(`${baseUrl}/home`);
+ await page.getByRole('tab', { name: 'Parts' }).click();
+
+ await page.waitForURL('**/platform/part/category/index/details');
+ await page.goto(`${baseUrl}/part/category/index/parts`);
+ await page.getByText('1551ABK').click();
+ await page.getByRole('tab', { name: 'Allocations' }).click();
+ await page.getByRole('tab', { name: 'Used In' }).click();
+ await page.getByRole('tab', { name: 'Pricing' }).click();
+ await page.getByRole('tab', { name: 'Manufacturers' }).click();
+ await page.getByRole('tab', { name: 'Suppliers' }).click();
+ await page.getByRole('tab', { name: 'Purchase Orders' }).click();
+ await page.getByRole('tab', { name: 'Scheduling' }).click();
+ await page.getByRole('tab', { name: 'Stocktake' }).click();
+ await page.getByRole('tab', { name: 'Attachments' }).click();
+ await page.getByRole('tab', { name: 'Notes' }).click();
+ await page.getByRole('tab', { name: 'Related Parts' }).click();
+
+ // Related Parts
+ await page.getByText('1551ACLR').click();
+ await page.getByRole('tab', { name: 'Part Details' }).click();
+ await page.getByRole('tab', { name: 'Parameters' }).click();
+ // await page.getByRole('tab', { name: 'Stock' }).click();
+ await page.getByRole('tab', { name: 'Allocations' }).click();
+ await page.getByRole('tab', { name: 'Used In' }).click();
+ await page.getByRole('tab', { name: 'Pricing' }).click();
+});
+
+test('PUI - Parts - Manufacturer Parts', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.goto(`${baseUrl}/part/84/manufacturers`);
+
+ await page.getByRole('tab', { name: 'Manufacturers' }).click();
+ await page.getByText('Hammond Manufacturing').click();
+ await page.getByRole('tab', { name: 'Parameters' }).click();
+ await page.getByRole('tab', { name: 'Suppliers' }).click();
+ await page.getByRole('tab', { name: 'Attachments' }).click();
+ await page.getByText('1551ACLR - 1551ACLR').waitFor();
+});
+
+test('PUI - Parts - Supplier Parts', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.goto(`${baseUrl}/part/15/suppliers`);
+
+ await page.getByRole('tab', { name: 'Suppliers' }).click();
+ await page.getByRole('cell', { name: 'DIG-84670-SJI' }).click();
+ await page.getByRole('tab', { name: 'Received Stock' }).click(); //
+ await page.getByRole('tab', { name: 'Purchase Orders' }).click();
+ await page.getByRole('tab', { name: 'Pricing' }).click();
+ await page.getByText('DIG-84670-SJI - R_550R_0805_1%').waitFor();
+});
+
+test('PUI - Sales', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.goto(`${baseUrl}/sales/`);
+
+ await page.waitForURL('**/platform/sales/**');
+ await page.waitForURL('**/platform/sales/index/salesorders');
+ await page.getByRole('tab', { name: 'Return Orders' }).click();
+
+ // Customers
+ await page.getByRole('tab', { name: 'Customers' }).click();
+ await page.getByText('Customer A').click();
+ await page.getByRole('tab', { name: 'Notes' }).click();
+ await page.getByRole('tab', { name: 'Attachments' }).click();
+ await page.getByRole('tab', { name: 'Contacts' }).click();
+ await page.getByRole('tab', { name: 'Assigned Stock' }).click();
+ await page.getByRole('tab', { name: 'Return Orders' }).click();
+ await page.getByRole('tab', { name: 'Sales Orders' }).click();
+ await page.getByRole('tab', { name: 'Contacts' }).click();
+ await page.getByRole('cell', { name: 'Dorathy Gross' }).waitFor();
+ await page
+ .getByRole('row', { name: 'Dorathy Gross dorathy.gross@customer.com' })
+ .waitFor();
+
+ // Sales Order Details
+ await page.getByRole('tab', { name: 'Sales Orders' }).click();
+ await page.getByRole('cell', { name: 'SO0001' }).click();
+ await page
+ .getByLabel('Order Details')
+ .getByText('Selling some stuff')
+ .waitFor();
+ await page.getByRole('tab', { name: 'Line Items' }).click();
+ await page.getByRole('tab', { name: 'Pending Shipments' }).click();
+ await page.getByRole('tab', { name: 'Completed Shipments' }).click();
+ await page.getByRole('tab', { name: 'Build Orders' }).click();
+ await page.getByText('No records found').first().waitFor();
+ await page.getByRole('tab', { name: 'Attachments' }).click();
+ await page.getByText('No attachments found').first().waitFor();
+ await page.getByRole('tab', { name: 'Notes' }).click();
+ await page.getByRole('tab', { name: 'Order Details' }).click();
+
+ // Return Order Details
+ await page.getByRole('link', { name: 'Customer A' }).click();
+ await page.getByRole('tab', { name: 'Return Orders' }).click();
+ await page.getByRole('cell', { name: 'RMA-' }).click();
+ await page.getByText('RMA-0001', { exact: true }).waitFor();
+ await page.getByRole('tab', { name: 'Line Items' }).click();
+ await page.getByRole('tab', { name: 'Attachments' }).click();
+ await page.getByRole('tab', { name: 'Notes' }).click();
+});
+
+test('PUI - Scanning', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.getByLabel('Homenav').click();
+ await page.getByRole('button', { name: 'System Information' }).click();
+ await page.locator('button').filter({ hasText: 'Dismiss' }).click();
+ await page.getByRole('link', { name: 'Scanning' }).click();
+ await page.waitForTimeout(200);
+
+ await page.locator('.mantine-Overlay-root').click();
+ await page.getByPlaceholder('Select input method').click();
+ await page.getByRole('option', { name: 'Manual input' }).click();
+ await page.getByPlaceholder('Enter item serial or data').click();
+ await page.getByPlaceholder('Enter item serial or data').fill('123');
+ await page.getByPlaceholder('Enter item serial or data').press('Enter');
+ await page.getByRole('cell', { name: 'manually' }).click();
+ await page.getByRole('button', { name: 'Lookup part' }).click();
+ await page.getByPlaceholder('Select input method').click();
+ await page.getByRole('option', { name: 'Manual input' }).click();
+});
+
+test('PUI - Admin', async ({ page }) => {
+ // Note here we login with admin access
+ await doQuickLogin(page, 'admin', 'inventree');
+
+ // User settings
+ await page.getByRole('button', { name: 'admin' }).click();
+ await page.getByRole('menuitem', { name: 'Account settings' }).click();
+ await page.getByRole('tab', { name: 'Security' }).click();
+ //await page.getByRole('tab', { name: 'Dashboard' }).click();
+ await page.getByRole('tab', { name: 'Display Options' }).click();
+ await page.getByText('Date Format').waitFor();
+ await page.getByRole('tab', { name: 'Search' }).click();
+ await page.getByText('Regex Search').waitFor();
+ await page.getByRole('tab', { name: 'Notifications' }).click();
+ await page.getByRole('tab', { name: 'Reporting' }).click();
+ await page.getByText('Inline report display').waitFor();
+
+ // System Settings
+ await page.getByRole('link', { name: 'Switch to System Setting' }).click();
+ await page.getByText('Base URL', { exact: true }).waitFor();
+ await page.getByRole('tab', { name: 'Login' }).click();
+ await page.getByRole('tab', { name: 'Barcodes' }).click();
+ await page.getByRole('tab', { name: 'Notifications' }).click();
+ await page.getByRole('tab', { name: 'Pricing' }).click();
+ await page.getByRole('tab', { name: 'Labels' }).click();
+ await page.getByRole('tab', { name: 'Reporting' }).click();
+ await page.getByRole('tab', { name: 'Part Categories' }).click();
+ //wait page.locator('#mantine-9hqbwrml8-tab-parts').click();
+ //await page.locator('#mantine-9hqbwrml8-tab-stock').click();
+ await page.getByRole('tab', { name: 'Stocktake' }).click();
+ await page.getByRole('tab', { name: 'Build Orders' }).click();
+ await page.getByRole('tab', { name: 'Purchase Orders' }).click();
+ await page.getByRole('tab', { name: 'Sales Orders' }).click();
+ await page.getByRole('tab', { name: 'Return Orders' }).click();
+
+ // Admin Center
+ await page.getByRole('button', { name: 'admin' }).click();
+ await page.getByRole('menuitem', { name: 'Admin Center' }).click();
+ await page.getByRole('tab', { name: 'Background Tasks' }).click();
+ await page.getByRole('tab', { name: 'Error Reports' }).click();
+ await page.getByRole('tab', { name: 'Currencies' }).click();
+ await page.getByRole('tab', { name: 'Project Codes' }).click();
+ await page.getByRole('tab', { name: 'Custom Units' }).click();
+ await page.getByRole('tab', { name: 'Part Parameters' }).click();
+ await page.getByRole('tab', { name: 'Category Parameters' }).click();
+ await page.getByRole('tab', { name: 'Templates' }).click();
+ await page.getByRole('tab', { name: 'Plugins' }).click();
+ await page.getByRole('tab', { name: 'Machines' }).click();
+});
+
+test('PUI - Language / Color', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.getByRole('button', { name: 'Ally Access' }).click();
+ await page.getByRole('menuitem', { name: 'Logout' }).click();
+ await page.getByRole('button', { name: 'Send me an email' }).click();
+ await page.getByRole('button').nth(3).click();
+ await page.getByLabel('Select language').click();
+ await page.getByRole('option', { name: 'German' }).click();
+ await page.waitForTimeout(200);
+
+ await page.getByRole('button', { name: 'Benutzername und Passwort' }).click();
+ await page.getByPlaceholder('Ihr Benutzername').click();
+ await page.getByPlaceholder('Ihr Benutzername').fill('admin');
+ await page.getByPlaceholder('Ihr Benutzername').press('Tab');
+ await page.getByPlaceholder('Dein Passwort').fill('inventree');
+ await page.getByRole('button', { name: 'Anmelden' }).click();
+ await page.waitForTimeout(200);
+
+ await page
+ .locator('span')
+ .filter({ hasText: 'AnzeigeneinstellungenFarbmodusSprache' })
+ .getByRole('button')
+ .click();
+ await page
+ .locator('span')
+ .filter({ hasText: 'AnzeigeneinstellungenFarbmodusSprache' })
+ .getByRole('button')
+ .click();
+ await page.getByRole('button', { name: "InvenTree's Logo" }).first().click();
+ await page.getByRole('tab', { name: 'Dashboard' }).click();
+ await page.waitForURL('**/platform/dashboard');
+});
+
+test('PUI - Company', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.goto(`${baseUrl}/company/1/details`);
+ await page
+ .locator('div')
+ .filter({ hasText: /^DigiKey Electronics$/ })
+ .waitFor();
+ await page.getByRole('cell', { name: 'https://www.digikey.com/' }).waitFor();
+ await page.getByRole('tab', { name: 'Supplied Parts' }).click();
+ await page
+ .getByRole('cell', { name: 'RR05P100KDTR-ND', exact: true })
+ .waitFor();
+ await page.getByRole('tab', { name: 'Purchase Orders' }).click();
+ await page.getByRole('cell', { name: 'Molex connectors' }).first().waitFor();
+ await page.getByRole('tab', { name: 'Stock Items' }).click();
+ await page.getByRole('cell', { name: 'Blue plastic enclosure' }).waitFor();
+ await page.getByRole('tab', { name: 'Contacts' }).click();
+ await page.getByRole('cell', { name: 'jimmy.mcleod@digikey.com' }).waitFor();
+ await page.getByRole('tab', { name: 'Addresses' }).click();
+ await page.getByRole('cell', { name: 'Carla Tunnel' }).waitFor();
+ await page.getByRole('tab', { name: 'Attachments' }).click();
+ await page.getByRole('tab', { name: 'Notes' }).click();
+});
diff --git a/src/frontend/tests/pui_stock.spec.ts b/src/frontend/tests/pui_stock.spec.ts
new file mode 100644
index 0000000000..3b00340af8
--- /dev/null
+++ b/src/frontend/tests/pui_stock.spec.ts
@@ -0,0 +1,78 @@
+import { expect, test } from './baseFixtures.js';
+import { baseUrl, user } from './defaults.js';
+import { doQuickLogin } from './login.js';
+
+test('PUI - Stock', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.goto(`${baseUrl}/stock`);
+ await page.waitForURL('**/platform/stock/location/index/details');
+ await page.getByRole('tab', { name: 'Stock Items' }).click();
+ await page.getByRole('cell', { name: '1551ABK' }).click();
+ await page.getByRole('tab', { name: 'Stock', exact: true }).click();
+ await page.getByRole('tab', { name: 'Stock Locations' }).click();
+ await page.getByRole('cell', { name: 'Electronics Lab' }).first().click();
+ await page.getByRole('tab', { name: 'Default Parts' }).click();
+ await page.getByRole('tab', { name: 'Stock Locations' }).click();
+ await page.getByRole('tab', { name: 'Stock Items' }).click();
+ await page.getByRole('tab', { name: 'Location Details' }).click();
+});
+
+test('PUI - Build', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.getByRole('tab', { name: 'Build' }).click();
+ await page.getByText('Widget Assembly Variant').click();
+ await page.getByRole('tab', { name: 'Allocate Stock' }).click();
+ await page.getByRole('tab', { name: 'Incomplete Outputs' }).click();
+ await page.getByRole('tab', { name: 'Completed Outputs' }).click();
+ await page.getByRole('tab', { name: 'Consumed Stock' }).click();
+ await page.getByRole('tab', { name: 'Child Build Orders' }).click();
+ await page.getByRole('tab', { name: 'Attachments' }).click();
+ await page.getByRole('tab', { name: 'Notes' }).click();
+});
+
+test('PUI - Purchasing', async ({ page }) => {
+ await doQuickLogin(page);
+
+ await page.getByRole('tab', { name: 'Purchasing' }).click();
+ await page.getByRole('cell', { name: 'PO0012' }).click();
+ await page.waitForTimeout(200);
+
+ await page.getByRole('tab', { name: 'Line Items' }).click();
+ await page.getByRole('tab', { name: 'Received Stock' }).click();
+ await page.getByRole('tab', { name: 'Attachments' }).click();
+ await page.getByRole('tab', { name: 'Purchasing' }).click();
+ await page.getByRole('tab', { name: 'Suppliers' }).click();
+ await page.getByText('Arrow', { exact: true }).click();
+ await page.waitForTimeout(200);
+
+ await page.getByRole('tab', { name: 'Supplied Parts' }).click();
+ await page.getByRole('tab', { name: 'Purchase Orders' }).click();
+ await page.getByRole('tab', { name: 'Stock Items' }).click();
+ await page.getByRole('tab', { name: 'Contacts' }).click();
+ await page.getByRole('tab', { name: 'Addresses' }).click();
+ await page.getByRole('tab', { name: 'Attachments' }).click();
+ await page.getByRole('tab', { name: 'Purchasing' }).click();
+ await page.getByRole('tab', { name: 'Manufacturers' }).click();
+ await page.getByText('AVX Corporation').click();
+ await page.waitForTimeout(200);
+
+ await page.getByRole('tab', { name: 'Addresses' }).click();
+ await page.getByRole('cell', { name: 'West Branch' }).click();
+ await page.locator('.mantine-ScrollArea-root').click();
+ await page
+ .getByRole('row', { name: 'West Branch Yes Surf Avenue 9' })
+ .getByRole('button')
+ .click();
+ await page.getByRole('menuitem', { name: 'Edit' }).click();
+ await page.getByLabel('Address title *').waitFor();
+
+ // Read the current value of the cell, to ensure we always *change* it!
+ const value = await page.getByLabel('Line 2').inputValue();
+ await page.getByLabel('Line 2').fill(value == 'old' ? 'new' : 'old');
+
+ await page.getByRole('button', { name: 'Submit' }).isEnabled();
+ await page.getByRole('button', { name: 'Submit' }).click();
+ await page.getByRole('tab', { name: 'Details' }).waitFor();
+});
diff --git a/src/frontend/tests/ui_plattform.spec.ts b/src/frontend/tests/ui_plattform.spec.ts
deleted file mode 100644
index 85ea3d5381..0000000000
--- a/src/frontend/tests/ui_plattform.spec.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { classicUrl } from './baseFixtures';
-import { expect, test } from './baseFixtures.js';
-
-test('PUI - Basic test via django', async ({ page }) => {
- await page.goto(`${classicUrl}/platform/`);
- await expect(page).toHaveTitle('InvenTree Demo Server');
- await page.waitForURL('**/platform/');
- await page.getByLabel('username').fill('allaccess');
- await page.getByLabel('password').fill('nolimits');
- await page.getByRole('button', { name: 'Log in' }).click();
- await page.waitForURL('**/platform/*');
- await page.goto(`${classicUrl}/platform/`);
-
- await expect(page).toHaveTitle('InvenTree Demo Server');
-});
-
-test('PUI - Basic test', async ({ page }) => {
- await page.goto('./platform/');
- await expect(page).toHaveTitle('InvenTree');
- await page.waitForURL('**/platform/');
- await page.getByLabel('username').fill('allaccess');
- await page.getByLabel('password').fill('nolimits');
- await page.getByRole('button', { name: 'Log in' }).click();
- await page.waitForURL('**/platform');
- await page.goto('./platform/');
-
- await expect(page).toHaveTitle('InvenTree');
-});
diff --git a/src/frontend/yarn.lock b/src/frontend/yarn.lock
index 3926e5b20a..9297718e29 100644
--- a/src/frontend/yarn.lock
+++ b/src/frontend/yarn.lock
@@ -1036,6 +1036,18 @@
ramda "^0.27.1"
source-map "^0.8.0-beta.0"
+"@lingui/conf@4.10.0":
+ version "4.10.0"
+ resolved "https://registry.yarnpkg.com/@lingui/conf/-/conf-4.10.0.tgz#f8ebe7bc115051b82bb5823ecb9222fbe28a82c2"
+ integrity sha512-jHeuCMG25YWEWUQTl1QYz46/RJlQH+Nyx4Qt4uI9OiSXMJ5MiaHopj+Oi9qdI1q2iY0P1RhdwRegBcdET+yF8w==
+ dependencies:
+ "@babel/runtime" "^7.20.13"
+ chalk "^4.1.0"
+ cosmiconfig "^8.0.0"
+ jest-validate "^29.4.3"
+ jiti "^1.17.1"
+ lodash.get "^4.4.2"
+
"@lingui/conf@4.8.0":
version "4.8.0"
resolved "https://registry.yarnpkg.com/@lingui/conf/-/conf-4.8.0.tgz#d2675806fcafecc6ad29d30d1e273fd28835d20e"
@@ -1048,7 +1060,16 @@
jiti "^1.17.1"
lodash.get "^4.4.2"
-"@lingui/core@4.8.0", "@lingui/core@^4.7.1":
+"@lingui/core@4.10.0", "@lingui/core@^4.7.1":
+ version "4.10.0"
+ resolved "https://registry.yarnpkg.com/@lingui/core/-/core-4.10.0.tgz#7944cd49e3f6778f7a7be98f7ab64ccb0ec53b5f"
+ integrity sha512-KfwkghuCVFt3AxZlAIotTvIcopIpHj4prwG9v6iyrksLXoxKPQMBXutYGl/EIZE1KYQZdR6rjAaoilMl0pSGKA==
+ dependencies:
+ "@babel/runtime" "^7.20.13"
+ "@lingui/message-utils" "4.10.0"
+ unraw "^3.0.0"
+
+"@lingui/core@4.8.0":
version "4.8.0"
resolved "https://registry.yarnpkg.com/@lingui/core/-/core-4.8.0.tgz#9d94857e50e82b118d75074cbed41c1358c76ae0"
integrity sha512-csETD7Vi2SSvH1F+gASGPf9TISoQFxA3YTB7MbRthtqK73TtWbEAmNtztIYPjPtNQemd7GwFztT/X6OANbjYhA==
@@ -1067,16 +1088,24 @@
date-fns "^3.6.0"
pofile "^1.1.4"
-"@lingui/macro@^4.7.2":
- version "4.8.0"
- resolved "https://registry.yarnpkg.com/@lingui/macro/-/macro-4.8.0.tgz#00f98bd3bc2b022e03c020e73a9594b61802788e"
- integrity sha512-5/MGOzuBAqi7vQhn6/8HO0/pPdqk+bLO7QzLsz8imEL58amaBbQmc0WmQRI4DvUknIQnnqlMx5wSAyXuHridrg==
+"@lingui/macro@^4.10.0":
+ version "4.10.0"
+ resolved "https://registry.yarnpkg.com/@lingui/macro/-/macro-4.10.0.tgz#c0c909d318acbb4b2d2792f6c7266fd22a7e9830"
+ integrity sha512-u+rSqCfQOHPyNwpdq+69LfoOBN6hiQJf0pNOB88kxdVammv4ul9lqnnJW0+hz4gh9POX1jhXjbLf2pStTH1q9w==
dependencies:
"@babel/runtime" "^7.20.13"
"@babel/types" "^7.20.7"
- "@lingui/conf" "4.8.0"
- "@lingui/core" "4.8.0"
- "@lingui/message-utils" "4.8.0"
+ "@lingui/conf" "4.10.0"
+ "@lingui/core" "4.10.0"
+ "@lingui/message-utils" "4.10.0"
+
+"@lingui/message-utils@4.10.0":
+ version "4.10.0"
+ resolved "https://registry.yarnpkg.com/@lingui/message-utils/-/message-utils-4.10.0.tgz#2d575c5f2808b275c56495343b78c0b47d4443e6"
+ integrity sha512-p9Z4L4//ef1jpwqUR0hnILPbbqhVOXkLktY/EsZ7LMmvn18yhq4FjCtGsrorclTcTdtl0l7bqW4iEpEqGW91Gw==
+ dependencies:
+ "@messageformat/parser" "^5.0.0"
+ js-sha256 "^0.10.1"
"@lingui/message-utils@4.8.0":
version "4.8.0"
@@ -1086,13 +1115,13 @@
"@messageformat/parser" "^5.0.0"
js-sha256 "^0.10.1"
-"@lingui/react@^4.7.2":
- version "4.8.0"
- resolved "https://registry.yarnpkg.com/@lingui/react/-/react-4.8.0.tgz#7d9d24f465f6fdbf76cff622f4f8538a65d71546"
- integrity sha512-GVoGDYZAN9wHrEvQWljxS1CZqZ80yLtK0LS8Y907RLlmD3GXLwNvT63iJUHwRu4710HNdgD7qM7XNOgPZZNu7A==
+"@lingui/react@^4.10.0":
+ version "4.10.0"
+ resolved "https://registry.yarnpkg.com/@lingui/react/-/react-4.10.0.tgz#56dce040659c94c1125640f8e399f68164b44ade"
+ integrity sha512-QBbgKnIEePbt2ktq/6AVi9q91TRbwvcdrruOMu3qqXBqcF4KMu7rf05M9tvk/cClTjImuOF+FI3k+MX6LGnnYQ==
dependencies:
"@babel/runtime" "^7.20.13"
- "@lingui/core" "4.8.0"
+ "@lingui/core" "4.10.0"
"@mantine/carousel@<7":
version "6.0.21"
@@ -1156,6 +1185,13 @@
"@mantine/utils" "6.0.21"
react-transition-group "4.4.2"
+"@mantine/spotlight@<7":
+ version "6.0.21"
+ resolved "https://registry.yarnpkg.com/@mantine/spotlight/-/spotlight-6.0.21.tgz#98f507bd3429fee1f2b57ad5ef9f88d1d8d8ff32"
+ integrity sha512-xJqF2Vpn8s6I4mSF+iCi7IzqL8iaqbvq0RcYlF1usLZYW2HrArX31s1r11DmzqM1PIuBQUhquW8jUXx/MZy3oA==
+ dependencies:
+ "@mantine/utils" "6.0.21"
+
"@mantine/styles@6.0.21":
version "6.0.21"
resolved "https://registry.yarnpkg.com/@mantine/styles/-/styles-6.0.21.tgz#8ea097fc76cbb3ed55f5cfd719d2f910aff5031b"
@@ -1185,12 +1221,12 @@
nanoid "^4.0.0"
react-draggable "^4.4.5"
-"@playwright/test@^1.41.2":
- version "1.43.0"
- resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.43.0.tgz#5d90f247b26d404dd5d81c60f9c7c5e5159eb664"
- integrity sha512-Ebw0+MCqoYflop7wVKj711ccbNlrwTBCtjY5rlbiY9kHL2bCYxq+qltK6uPsVBGGAOb033H2VO0YobcQVxoW7Q==
+"@playwright/test@^1.43.1":
+ version "1.43.1"
+ resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.43.1.tgz#16728a59eb8ce0f60472f98d8886d6cab0fa3e42"
+ integrity sha512-HgtQzFgNEEo4TE22K/X7sYTYNqEMMTZmFS8kTq6m8hXj+m1D8TgwgIbumHddJa9h4yl4GkKb8/bgAl2+g7eDgA==
dependencies:
- playwright "1.43.0"
+ playwright "1.43.1"
"@radix-ui/number@1.0.0":
version "1.0.0"
@@ -1513,6 +1549,57 @@
dependencies:
"@types/tern" "*"
+"@types/d3-array@^3.0.3":
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.2.1.tgz#1f6658e3d2006c4fceac53fde464166859f8b8c5"
+ integrity sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==
+
+"@types/d3-color@*":
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-3.1.3.tgz#368c961a18de721da8200e80bf3943fb53136af2"
+ integrity sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==
+
+"@types/d3-ease@^3.0.0":
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/@types/d3-ease/-/d3-ease-3.0.2.tgz#e28db1bfbfa617076f7770dd1d9a48eaa3b6c51b"
+ integrity sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==
+
+"@types/d3-interpolate@^3.0.1":
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz#412b90e84870285f2ff8a846c6eb60344f12a41c"
+ integrity sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==
+ dependencies:
+ "@types/d3-color" "*"
+
+"@types/d3-path@*":
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-3.1.0.tgz#2b907adce762a78e98828f0b438eaca339ae410a"
+ integrity sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==
+
+"@types/d3-scale@^4.0.2":
+ version "4.0.8"
+ resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.8.tgz#d409b5f9dcf63074464bf8ddfb8ee5a1f95945bb"
+ integrity sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==
+ dependencies:
+ "@types/d3-time" "*"
+
+"@types/d3-shape@^3.1.0":
+ version "3.1.6"
+ resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-3.1.6.tgz#65d40d5a548f0a023821773e39012805e6e31a72"
+ integrity sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==
+ dependencies:
+ "@types/d3-path" "*"
+
+"@types/d3-time@*", "@types/d3-time@^3.0.0":
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-3.0.3.tgz#3c186bbd9d12b9d84253b6be6487ca56b54f88be"
+ integrity sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==
+
+"@types/d3-timer@^3.0.0":
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-3.0.2.tgz#70bbda77dc23aa727413e22e214afa3f0e852f70"
+ integrity sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==
+
"@types/estree@*", "@types/estree@1.0.5":
version "1.0.5"
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -2155,6 +2242,77 @@ csstype@^3.0.2:
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
+"d3-array@2 - 3", "d3-array@2.10.0 - 3", d3-array@^3.1.6:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5"
+ integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==
+ dependencies:
+ internmap "1 - 2"
+
+"d3-color@1 - 3":
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
+ integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
+
+d3-ease@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
+ integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
+
+"d3-format@1 - 3":
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641"
+ integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
+
+"d3-interpolate@1.2.0 - 3", d3-interpolate@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
+ integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
+ dependencies:
+ d3-color "1 - 3"
+
+d3-path@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526"
+ integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==
+
+d3-scale@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396"
+ integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==
+ dependencies:
+ d3-array "2.10.0 - 3"
+ d3-format "1 - 3"
+ d3-interpolate "1.2.0 - 3"
+ d3-time "2.1.1 - 3"
+ d3-time-format "2 - 4"
+
+d3-shape@^3.1.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.2.0.tgz#a1a839cbd9ba45f28674c69d7f855bcf91dfc6a5"
+ integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==
+ dependencies:
+ d3-path "^3.1.0"
+
+"d3-time-format@2 - 4":
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.1.0.tgz#7ab5257a5041d11ecb4fe70a5c7d16a195bb408a"
+ integrity sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==
+ dependencies:
+ d3-time "1 - 3"
+
+"d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.1.0.tgz#9310db56e992e3c0175e1ef385e545e48a9bb5c7"
+ integrity sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==
+ dependencies:
+ d3-array "2 - 3"
+
+d3-timer@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
+ integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
+
date-fns@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf"
@@ -2177,6 +2335,11 @@ decamelize@^1.2.0:
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
+decimal.js-light@^2.4.1:
+ version "2.5.1"
+ resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934"
+ integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==
+
default-require-extensions@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-3.0.1.tgz#bfae00feeaeada68c2ae256c62540f60b80625bd"
@@ -2225,23 +2388,23 @@ electron-to-chromium@^1.4.668:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.729.tgz#8477d21e2a50993781950885b2731d92ad532c00"
integrity sha512-bx7+5Saea/qu14kmPTDHQxkp2UnziG3iajUQu3BxFvCOnpAJdDbMV4rSl+EqFDkkpNNVUFlR1kDfpL59xfy1HA==
-embla-carousel-react@^8.0.0:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/embla-carousel-react/-/embla-carousel-react-8.0.1.tgz#6c0420e54079a3f47fad1b4e982be782066f5b2c"
- integrity sha512-cpFQ/HwCsjBjzpu9Z9IHmZ9DaCSf/wo4q+qUTcRW3SsNv+1Q8IY7Y8J2QIyTmz0vOWY7tliu3uE2gqRH7ZDwOQ==
+embla-carousel-react@^8.0.2:
+ version "8.0.2"
+ resolved "https://registry.yarnpkg.com/embla-carousel-react/-/embla-carousel-react-8.0.2.tgz#8f27b34c04aa9fccdd6059727f573d9e7ed63d27"
+ integrity sha512-RHe1GKLulOW8EDN+cJgbFbVVfRXcaLT2/89dyVw3ONGgVpZjD19wB87I1LUZ1aCzOSrTccx0PFSQanK4OOfGPA==
dependencies:
- embla-carousel "8.0.1"
- embla-carousel-reactive-utils "8.0.1"
+ embla-carousel "8.0.2"
+ embla-carousel-reactive-utils "8.0.2"
-embla-carousel-reactive-utils@8.0.1:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.0.1.tgz#7fe11dd07bf9f8e95debdc2e4415d608fe8723c6"
- integrity sha512-KBSkz2h9LwVFkOrwzIJKgXbmEDlIShkreeOHnV8Cph09AdBMzb412nRkcctbeDcuG9x3CVsqLzJrSXnZeYhFPQ==
+embla-carousel-reactive-utils@8.0.2:
+ version "8.0.2"
+ resolved "https://registry.yarnpkg.com/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.0.2.tgz#cd48cbe46198d9a64b0a8d62ce6832ae97c9fe70"
+ integrity sha512-nLZqDkQdO0hvOP49/dUwjkkepMnUXgIzhyRuDjwGqswpB4Ibnc5M+w7rSQQAM+uMj0cPaXnYOTlv8XD7I/zVNw==
-embla-carousel@8.0.1:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/embla-carousel/-/embla-carousel-8.0.1.tgz#a9dd052d91a97b15c362723611ba7687193dba99"
- integrity sha512-RsaMRyBCd144N95gb3XoI+H9zj3RI4y0qcfvKYEh2tIAIEenL9CW9vwzltCeoYkWYipGdkvup+HGT9ewG1YTEw==
+embla-carousel@8.0.2:
+ version "8.0.2"
+ resolved "https://registry.yarnpkg.com/embla-carousel/-/embla-carousel-8.0.2.tgz#31546bcdff7971d44d29cf6bb824ebe923317233"
+ integrity sha512-bogsDO8xosuh/l3PxIvA5AMl3+BnRVAse9sDW/60amzj4MbGS5re4WH5eVEXiuH8G1/3G7QUAX2QNr3Yx8z5rA==
emoji-regex@^8.0.0:
version "8.0.0"
@@ -2351,6 +2514,11 @@ esprima@^4.0.0:
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+eventemitter3@^4.0.1:
+ version "4.0.7"
+ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+ integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
external-editor@^3.0.3:
version "3.1.0"
resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -2370,6 +2538,11 @@ fast-equals@^4.0.3:
resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-4.0.3.tgz#72884cc805ec3c6679b99875f6b7654f39f0e8c7"
integrity sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg==
+fast-equals@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-5.0.1.tgz#a4eefe3c5d1c0d021aeed0bc10ba5e0c12ee405d"
+ integrity sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==
+
figures@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -2620,6 +2793,11 @@ inquirer@^7.3.3:
strip-ansi "^6.0.0"
through "^2.3.6"
+"internmap@1 - 2":
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009"
+ integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==
+
invariant@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -3226,17 +3404,17 @@ pkg-up@^3.1.0:
dependencies:
find-up "^3.0.0"
-playwright-core@1.43.0:
- version "1.43.0"
- resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.43.0.tgz#d8079acb653abebb0b63062e432479647a4e1271"
- integrity sha512-iWFjyBUH97+pUFiyTqSLd8cDMMOS0r2ZYz2qEsPjH8/bX++sbIJT35MSwKnp1r/OQBAqC5XO99xFbJ9XClhf4w==
+playwright-core@1.43.1:
+ version "1.43.1"
+ resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.43.1.tgz#0eafef9994c69c02a1a3825a4343e56c99c03b02"
+ integrity sha512-EI36Mto2Vrx6VF7rm708qSnesVQKbxEWvPrfA1IPY6HgczBplDx7ENtx+K2n4kJ41sLLkuGfmb0ZLSSXlDhqPg==
-playwright@1.43.0:
- version "1.43.0"
- resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.43.0.tgz#2c2efd4ee2a25defd8c24c98ccb342bdd9d435f5"
- integrity sha512-SiOKHbVjTSf6wHuGCbqrEyzlm6qvXcv7mENP+OZon1I07brfZLGdfWV0l/efAzVx7TF3Z45ov1gPEkku9q25YQ==
+playwright@1.43.1:
+ version "1.43.1"
+ resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.43.1.tgz#8ad08984ac66c9ef3d0db035be54dd7ec9f1c7d9"
+ integrity sha512-V7SoH0ai2kNt1Md9E3Gwas5B9m8KR2GVvwZnAI6Pg0m3sh7UvgiYhRrhsziCmqMJNouPckiOhk8T+9bSAK0VIA==
dependencies:
- playwright-core "1.43.0"
+ playwright-core "1.43.1"
optionalDependencies:
fsevents "2.3.2"
@@ -3343,12 +3521,12 @@ react-grid-layout@^1.4.4:
react-resizable "^3.0.5"
resize-observer-polyfill "^1.5.1"
-react-hook-form@^7.51.2:
- version "7.51.2"
- resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.51.2.tgz#79f7f72ee217c5114ff831012d1a7ec344096e7f"
- integrity sha512-y++lwaWjtzDt/XNnyGDQy6goHskFualmDlf+jzEZvjvz6KWDf7EboL7pUvRCzPTJd0EOPpdekYaQLEvvG6m6HA==
+react-hook-form@^7.51.3:
+ version "7.51.3"
+ resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.51.3.tgz#7486dd2d52280b6b28048c099a98d2545931cab3"
+ integrity sha512-cvJ/wbHdhYx8aviSWh28w9ImjmVsb5Y05n1+FW786vEZQJV5STNM0pW6ujS+oiBecb0ARBxJFyAnXj9+GHXACQ==
-react-is@^16.13.1, react-is@^16.7.0:
+react-is@^16.10.2, react-is@^16.13.1, react-is@^16.7.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -3427,6 +3605,15 @@ react-simplemde-editor@^5.2.0:
dependencies:
"@types/codemirror" "~5.60.5"
+react-smooth@^4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/react-smooth/-/react-smooth-4.0.1.tgz#6200d8699bfe051ae40ba187988323b1449eab1a"
+ integrity sha512-OE4hm7XqR0jNOq3Qmk9mFLyd6p2+j6bvbPJ7qlB7+oo0eNcL2l7WQzG6MBnT3EXY6xzkLMUBec3AfewJdA0J8w==
+ dependencies:
+ fast-equals "^5.0.1"
+ prop-types "^15.8.1"
+ react-transition-group "^4.4.5"
+
react-style-singleton@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4"
@@ -3455,7 +3642,7 @@ react-transition-group@4.4.2:
loose-envify "^1.4.0"
prop-types "^15.6.2"
-react-transition-group@^4.3.0:
+react-transition-group@^4.3.0, react-transition-group@^4.4.5:
version "4.4.5"
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
@@ -3488,6 +3675,27 @@ readdirp@~3.5.0:
dependencies:
picomatch "^2.2.1"
+recharts-scale@^0.4.4:
+ version "0.4.5"
+ resolved "https://registry.yarnpkg.com/recharts-scale/-/recharts-scale-0.4.5.tgz#0969271f14e732e642fcc5bd4ab270d6e87dd1d9"
+ integrity sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==
+ dependencies:
+ decimal.js-light "^2.4.1"
+
+recharts@^2.12.4:
+ version "2.12.4"
+ resolved "https://registry.yarnpkg.com/recharts/-/recharts-2.12.4.tgz#e560a57cd44ab554c99a0d93bdd58d059b309a2e"
+ integrity sha512-dM4skmk4fDKEDjL9MNunxv6zcTxePGVEzRnLDXALRpfJ85JoQ0P0APJ/CoJlmnQI0gPjBlOkjzrwrfQrRST3KA==
+ dependencies:
+ clsx "^2.0.0"
+ eventemitter3 "^4.0.1"
+ lodash "^4.17.21"
+ react-is "^16.10.2"
+ react-smooth "^4.0.0"
+ recharts-scale "^0.4.4"
+ tiny-invariant "^1.3.1"
+ victory-vendor "^36.6.8"
+
regenerator-runtime@^0.14.0:
version "0.14.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
@@ -3840,6 +4048,11 @@ through@^2.3.6:
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+tiny-invariant@^1.3.1:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
+ integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
+
tmp@^0.0.33:
version "0.0.33"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -3968,6 +4181,26 @@ uuid@^8.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+victory-vendor@^36.6.8:
+ version "36.9.2"
+ resolved "https://registry.yarnpkg.com/victory-vendor/-/victory-vendor-36.9.2.tgz#668b02a448fa4ea0f788dbf4228b7e64669ff801"
+ integrity sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==
+ dependencies:
+ "@types/d3-array" "^3.0.3"
+ "@types/d3-ease" "^3.0.0"
+ "@types/d3-interpolate" "^3.0.1"
+ "@types/d3-scale" "^4.0.2"
+ "@types/d3-shape" "^3.1.0"
+ "@types/d3-time" "^3.0.0"
+ "@types/d3-timer" "^3.0.0"
+ d3-array "^3.1.6"
+ d3-ease "^3.0.1"
+ d3-interpolate "^3.0.1"
+ d3-scale "^4.0.2"
+ d3-shape "^3.1.0"
+ d3-time "^3.0.0"
+ d3-timer "^3.0.1"
+
vite-plugin-babel-macros@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/vite-plugin-babel-macros/-/vite-plugin-babel-macros-1.0.6.tgz#d05cee3c38c620ccb534e38f412fdd899a3365b5"
diff --git a/tasks.py b/tasks.py
index 37052e2014..22f32f9edf 100644
--- a/tasks.py
+++ b/tasks.py
@@ -313,7 +313,9 @@ def remove_mfa(c, mail=''):
def static(c, frontend=False):
"""Copies required static files to the STATIC_ROOT directory, as per Django requirements."""
manage(c, 'prerender')
+
if frontend and node_available():
+ frontend_trans(c)
frontend_build(c)
print('Collecting static files...')
@@ -358,22 +360,73 @@ def translate(c, ignore_static=False, no_frontend=False):
static(c)
-@task
-def backup(c):
+@task(
+ help={
+ 'clean': 'Clean up old backup files',
+ 'path': 'Specify path for generated backup files (leave blank for default path)',
+ }
+)
+def backup(c, clean=False, path=None):
"""Backup the database and media files."""
print('Backing up InvenTree database...')
- manage(c, 'dbbackup --noinput --clean --compress')
+
+ cmd = '--noinput --compress -v 2'
+
+ if path:
+ cmd += f' -O {path}'
+
+ if clean:
+ cmd += ' --clean'
+
+ manage(c, f'dbbackup {cmd}')
print('Backing up InvenTree media files...')
- manage(c, 'mediabackup --noinput --clean --compress')
+ manage(c, f'mediabackup {cmd}')
-@task
-def restore(c):
+@task(
+ help={
+ 'path': 'Specify path to locate backup files (leave blank for default path)',
+ 'db_file': 'Specify filename of compressed database archive (leave blank to use most recent backup)',
+ 'media_file': 'Specify filename of compressed media archive (leave blank to use most recent backup)',
+ 'ignore_media': 'Do not import media archive (database restore only)',
+ 'ignore_database': 'Do not import database archive (media restore only)',
+ }
+)
+def restore(
+ c,
+ path=None,
+ db_file=None,
+ media_file=None,
+ ignore_media=False,
+ ignore_database=False,
+):
"""Restore the database and media files."""
- print('Restoring InvenTree database...')
- manage(c, 'dbrestore --noinput --uncompress')
- print('Restoring InvenTree media files...')
- manage(c, 'mediarestore --noinput --uncompress')
+ base_cmd = '--no-input --uncompress -v 2'
+
+ if path:
+ base_cmd += f' -I {path}'
+
+ if ignore_database:
+ print('Skipping database archive...')
+ else:
+ print('Restoring InvenTree database')
+ cmd = f'dbrestore {base_cmd}'
+
+ if db_file:
+ cmd += f' -i {db_file}'
+
+ manage(c, cmd)
+
+ if ignore_media:
+ print('Skipping media restore...')
+ else:
+ print('Restoring InvenTree media files')
+ cmd = f'mediarestore {base_cmd}'
+
+ if media_file:
+ cmd += f' -i {media_file}'
+
+ manage(c, cmd)
@task(post=[rebuild_models, rebuild_thumbnails])
@@ -907,6 +960,7 @@ def setup_test(c, ignore_update=False, dev=False, path='inventree-demo-dataset')
src = Path(path).joinpath('media').resolve()
dst = get_media_dir()
+ print(f'Copying media files - "{src}" to "{dst}"')
shutil.copytree(src, dst, dirs_exist_ok=True)
print('Done setting up test environment...')