Merge remote-tracking branch 'upstream/master' into barcode-generation

.pkgr.yml

@@ -14,8 +14,10 @@ env:
   - INVENTREE_BACKUP_DIR=/opt/inventree/backup
   - INVENTREE_PLUGIN_FILE=/opt/inventree/plugins.txt
   - INVENTREE_CONFIG_FILE=/opt/inventree/config.yaml
+  - APP_REPO=inventree/InvenTree
 before_install: contrib/packager.io/preinstall.sh
 after_install: contrib/packager.io/postinstall.sh
+before_remove: contrib/packager.io/preinstall.sh
 before:
   - contrib/packager.io/before.sh
 dependencies:

contrib/packager.io/before.sh

@@ -6,7 +6,6 @@
 set -eu
 
 # The sha is the second element in APP_PKG_ITERATION
-REPO="inventree/InvenTree"
 VERSION="$APP_PKG_VERSION-$APP_PKG_ITERATION"
 SHA=$(echo $APP_PKG_ITERATION | cut -d'.' -f2)
 
@@ -15,17 +14,17 @@ echo "INFO collection | Getting info from github for commit $SHA"
 curl -L -s -f \
   -H "Accept: application/vnd.github+json" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
-  https://api.github.com/repos/$REPO/commits/$SHA > commit.json
+  https://api.github.com/repos/$APP_REPO/commits/$SHA > commit.json
 echo "INFO collection | Got commit.json with size $(wc -c commit.json)"
 curl -L -s -f \
   -H "Accept: application/vnd.github+json" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
-  https://api.github.com/repos/$REPO/commits/$SHA/branches-where-head > branches.json
+  https://api.github.com/repos/$APP_REPO/commits/$SHA/branches-where-head > branches.json
 echo "INFO collection | Got branches.json with size $(wc -c branches.json)"
 curl -L -s -f \
   -H "Accept: application/vnd.github+json" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
-  https://api.github.com/repos/$REPO/commits/$APP_PKG_VERSION > tag.json
+  https://api.github.com/repos/$APP_REPO/commits/$APP_PKG_VERSION > tag.json
 echo "INFO collection | Got tag.json with size $(wc -c tag.json)"
 
 # Extract info
@@ -60,7 +59,7 @@ if [ "$TAG_SHA" != "$FULL_SHA" ]; then
   echo "INFO frontend | Tag sha '$TAG_SHA' is not the same as commit sha $FULL_SHA, can not download frontend"
 else
   echo "INFO frontend | Getting frontend from github via tag"
-  curl https://github.com/$REPO/releases/download/$APP_PKG_VERSION/frontend-build.zip -L -O -f
+  curl https://github.com/$APP_REPO/releases/download/$APP_PKG_VERSION/frontend-build.zip -L -O -f
   mkdir -p src/backend/InvenTree/web/static
   echo "INFO frontend | Unzipping frontend"
   unzip -qq frontend-build.zip -d src/backend/InvenTree/web/static/web

contrib/packager.io/functions.sh

@@ -60,7 +60,7 @@ function detect_python() {
   fi
 
   # Try to detect a python between 3.9 and 3.12 in reverse order
-  if [ -z "${SETUP_PYTHON}" ]; then
+  if [ -z "$(which ${SETUP_PYTHON})" ]; then
     echo "# Trying to detecting python3.${PYTHON_FROM} to python3.${PYTHON_TO} - using newest version"
     for i in $(seq $PYTHON_TO -1 $PYTHON_FROM); do
       echo "# Checking for python3.${i}"
@@ -318,17 +318,17 @@ function set_env() {
   sed -i s=debug:\ True=debug:\ False=g ${INVENTREE_CONFIG_FILE}
 
   # Database engine
-  sed -i s=#ENGINE:\ sampleengine=ENGINE:\ ${INVENTREE_DB_ENGINE}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#\ ENGINE:\ Database\ engine.\ Selection\ from:=ENGINE:\ ${INVENTREE_DB_ENGINE}=g ${INVENTREE_CONFIG_FILE}
   # Database name
-  sed -i s=#NAME:\ \'/path/to/database\'=NAME:\ \'${INVENTREE_DB_NAME}\'=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#\ NAME:\ Database\ name=NAME:\ \'${INVENTREE_DB_NAME}\'=g ${INVENTREE_CONFIG_FILE}
   # Database user
-  sed -i s=#USER:\ sampleuser=USER:\ ${INVENTREE_DB_USER}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#\ USER:\ Database\ username\ \(if\ required\)=USER:\ ${INVENTREE_DB_USER}=g ${INVENTREE_CONFIG_FILE}
   # Database password
-  sed -i s=#PASSWORD:\ samplepassword=PASSWORD:\ ${INVENTREE_DB_PASSWORD}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#\ PASSWORD:\ Database\ password\ \(if\ required\)=PASSWORD:\ ${INVENTREE_DB_PASSWORD}=g ${INVENTREE_CONFIG_FILE}
   # Database host
-  sed -i s=#HOST:\ samplehost=HOST:\ ${INVENTREE_DB_HOST}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#\ HOST:\ Database\ host\ address\ \(if\ required\)=HOST:\ ${INVENTREE_DB_HOST}=g ${INVENTREE_CONFIG_FILE}
   # Database port
-  sed -i s=#PORT:\ 123456=PORT:\ ${INVENTREE_DB_PORT}=g ${INVENTREE_CONFIG_FILE}
+  sed -i s=#\ PORT:\ Database\ host\ port\ \(if\ required\)=PORT:\ ${INVENTREE_DB_PORT}=g ${INVENTREE_CONFIG_FILE}
 
   # Fixing the permissions
   chown ${APP_USER}:${APP_GROUP} ${DATA_DIR} ${INVENTREE_CONFIG_FILE}

contrib/packager.io/preinstall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# packager.io preinstall script
+# packager.io preinstall/preremove script
 #
 PATH=${APP_HOME}/env/bin:${APP_HOME}/:/sbin:/bin:/usr/sbin:/usr/bin:
 

src/backend/InvenTree/config_template.yaml

@@ -11,6 +11,8 @@
 # Note: Database configuration options can also be specified from environmental variables,
 #       with the prefix INVENTREE_DB_
 #       e.g INVENTREE_DB_NAME / INVENTREE_DB_USER / INVENTREE_DB_PASSWORD
+# Do not change this section if you are using the package - use `inventree config` instead
+# TO MAINTAINERS: Do not change database strings
 database:
   # --- Available options: ---
   # ENGINE: Database engine. Selection from:

src/backend/requirements-dev.txt

@@ -398,9 +398,9 @@ pyyaml==6.0.1 \
     # via
     #   -c src/backend/requirements.txt
     #   pre-commit
-setuptools==70.3.0 \
+setuptools==71.0.3 \
-    --hash=sha256:f171bab1dfbc86b132997f26a119f6056a57950d058587841a0082e8830f9dc5 \
+    --hash=sha256:3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d \
-    --hash=sha256:fe384da74336c398e0d956d1cae0669bc02eed936cdb1d49b57de1990dc11ffc
+    --hash=sha256:f501b6e6db709818dc76882582d9c516bf3b67b948864c5fa1d1624c09a49207
     # via
     #   -c src/backend/requirements.txt
     #   -r src/backend/requirements-dev.in

src/backend/requirements.txt

@@ -1543,15 +1543,15 @@ rpds-py==0.18.1 \
     # via
     #   jsonschema
     #   referencing
-sentry-sdk==2.7.0 \
+sentry-sdk==2.8.0 \
-    --hash=sha256:d846a211d4a0378b289ced3c434480945f110d0ede00450ba631fc2852e7a0d4 \
+    --hash=sha256:6051562d2cfa8087bb8b4b8b79dc44690f8a054762a29c07e22588b1f619bfb5 \
-    --hash=sha256:db9594c27a4d21c1ebad09908b1f0dc808ef65c2b89c1c8e7e455143262e37c1
+    --hash=sha256:aa4314f877d9cd9add5a0c9ba18e3f27f99f7de835ce36bd150e48a41c7c646f
     # via
     #   -r src/backend/requirements.in
     #   django-q-sentry
-setuptools==70.3.0 \
+setuptools==71.0.3 \
-    --hash=sha256:f171bab1dfbc86b132997f26a119f6056a57950d058587841a0082e8830f9dc5 \
+    --hash=sha256:3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d \
-    --hash=sha256:fe384da74336c398e0d956d1cae0669bc02eed936cdb1d49b57de1990dc11ffc
+    --hash=sha256:f501b6e6db709818dc76882582d9c516bf3b67b948864c5fa1d1624c09a49207
     # via
     #   -r src/backend/requirements.in
     #   django-money

src/frontend/src/components/DashboardItemProxy.tsx

@@ -31,7 +31,7 @@ export function DashboardItemProxy({
     queryFn: fetchData,
     refetchOnWindowFocus: autoupdate
   });
-  const [dashdata, setDashData] = useState({ title: t`Title`, value: '000' });
+  const [dashData, setDashData] = useState({ title: t`Title`, value: '000' });
 
   useEffect(() => {
     if (data) {
@@ -44,7 +44,7 @@ export function DashboardItemProxy({
     <div key={id}>
       <StatisticItem
         id={id}
-        data={dashdata}
+        data={dashData}
         isLoading={isLoading || isFetching}
       />
     </div>

src/frontend/src/components/buttons/AdminButton.tsx

@@ -1,11 +1,8 @@
 import { t } from '@lingui/macro';
 import { IconUserStar } from '@tabler/icons-react';
 import { useCallback, useMemo } from 'react';
-import { useNavigate } from 'react-router-dom';
 
 import { ModelType } from '../../enums/ModelType';
-import { navigateToLink } from '../../functions/navigation';
-import { base_url } from '../../main';
 import { useLocalState } from '../../states/LocalState';
 import { useUserState } from '../../states/UserState';
 import { ModelInformationDict } from '../render/ModelType';

src/frontend/src/components/buttons/PrintingActions.tsx

@@ -2,7 +2,7 @@ import { t } from '@lingui/macro';
 import { notifications } from '@mantine/notifications';
 import { IconPrinter, IconReport, IconTags } from '@tabler/icons-react';
 import { useQuery } from '@tanstack/react-query';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 
 import { api } from '../../App';
 import { ApiEndpoints } from '../../enums/ApiEndpoints';

src/frontend/src/components/details/DetailsImage.tsx

@@ -85,7 +85,7 @@ function UploadModal({
   apiPath: string;
   setImage: (image: string) => void;
 }) {
-  const [file1, setFile] = useState<FileWithPath | null>(null);
+  const [currentFile, setCurrentFile] = useState<FileWithPath | null>(null);
   let uploading = false;
 
   // Components to show in the Dropzone when no file is selected
@@ -168,7 +168,7 @@ function UploadModal({
   return (
     <Paper style={{ height: '220px' }}>
       <Dropzone
-        onDrop={(files) => setFile(files[0])}
+        onDrop={(files) => setCurrentFile(files[0])}
         maxFiles={1}
         accept={IMAGE_MIME_TYPE}
         loading={uploading}
@@ -198,7 +198,9 @@ function UploadModal({
               }}
             />
           </Dropzone.Reject>
-          <Dropzone.Idle>{file1 ? fileInfo(file1) : noFileIdle}</Dropzone.Idle>
+          <Dropzone.Idle>
+            {currentFile ? fileInfo(currentFile) : noFileIdle}
+          </Dropzone.Idle>
         </Group>
       </Dropzone>
       <Paper
@@ -218,12 +220,15 @@ function UploadModal({
       >
         <Button
           variant="outline"
-          disabled={!file1}
+          disabled={!currentFile}
-          onClick={() => setFile(null)}
+          onClick={() => setCurrentFile(null)}
         >
           <Trans>Clear</Trans>
         </Button>
-        <Button disabled={!file1} onClick={() => uploadImage(file1)}>
+        <Button
+          disabled={!currentFile}
+          onClick={() => uploadImage(currentFile)}
+        >
           <Trans>Submit</Trans>
         </Button>
       </Paper>
@@ -354,7 +359,6 @@ export function DetailsImage(props: Readonly<DetailImageProps>) {
   };
 
   return (
-    <>
     <AspectRatio ref={ref} maw={IMAGE_DIMENSION} ratio={1} pos="relative">
       <>
         <ApiImage
@@ -363,9 +367,7 @@ export function DetailsImage(props: Readonly<DetailImageProps>) {
           maw={IMAGE_DIMENSION}
           onClick={expandImage}
         />
-          {permissions.hasChangeRole(props.appRole) &&
+        {permissions.hasChangeRole(props.appRole) && hasOverlay && hovered && (
-            hasOverlay &&
-            hovered && (
           <Overlay color="black" opacity={0.8} onClick={expandImage}>
             <ImageActionButtons
               visible={hovered}
@@ -379,6 +381,5 @@ export function DetailsImage(props: Readonly<DetailImageProps>) {
         )}
       </>
     </AspectRatio>
-    </>
   );
 }

src/frontend/src/components/errors/GenericErrorPage.tsx

@@ -1,7 +1,6 @@
 import { Trans } from '@lingui/macro';
 import {
   ActionIcon,
-  Alert,
   Button,
   Card,
   Center,

src/frontend/src/components/forms/fields/ApiFormField.tsx

@@ -1,15 +1,7 @@
 import { t } from '@lingui/macro';
-import {
+import { Alert, FileInput, NumberInput, Stack, Switch } from '@mantine/core';
-  Alert,
-  FileInput,
-  NumberInput,
-  Stack,
-  Switch,
-  TextInput
-} from '@mantine/core';
 import { UseFormReturnType } from '@mantine/form';
 import { useId } from '@mantine/hooks';
-import { IconX } from '@tabler/icons-react';
 import { ReactNode, useCallback, useEffect, useMemo } from 'react';
 import { Control, FieldValues, useController } from 'react-hook-form';
 

src/frontend/src/components/forms/fields/TableField.tsx

@@ -1,5 +1,5 @@
 import { Trans, t } from '@lingui/macro';
-import { Container, Flex, Group, Table } from '@mantine/core';
+import { Container, Group, Table } from '@mantine/core';
 import { useEffect, useMemo } from 'react';
 import { FieldValues, UseControllerReturn } from 'react-hook-form';
 

src/frontend/src/components/importer/ImporterImportProgress.tsx

@@ -29,7 +29,6 @@ export default function ImporterImportProgress({
   }, []);
 
   return (
-    <>
     <Center>
       <Container>
         <Stack gap="xs">
@@ -41,6 +40,5 @@ export default function ImporterImportProgress({
         </Stack>
       </Container>
     </Center>
-    </>
   );
 }

src/frontend/src/components/items/GettingStartedCarousel.tsx

@@ -1,6 +1,6 @@
 import { Trans } from '@lingui/macro';
 import { Carousel } from '@mantine/carousel';
-import { Anchor, Button, Paper, Text, Title, rem } from '@mantine/core';
+import { Anchor, Button, Paper, Text, Title } from '@mantine/core';
 
 import { DocumentationLinkItem } from './DocumentationLinks';
 import * as classes from './GettingStartedCarousel.css';

src/frontend/src/components/modals/QrCodeModal.tsx

@@ -35,7 +35,7 @@ export function QrCodeModal({
     key: 'camId',
     defaultValue: null
   });
-  const [ScanningEnabled, setIsScanning] = useState<boolean>(false);
+  const [scanningEnabled, setScanningEnabled] = useState<boolean>(false);
   const [wasAutoPaused, setWasAutoPaused] = useState<boolean>(false);
   const documentState = useDocumentVisibility();
 
@@ -48,7 +48,7 @@ export function QrCodeModal({
 
   // Stop/star when leaving or reentering page
   useEffect(() => {
-    if (ScanningEnabled && documentState === 'hidden') {
+    if (scanningEnabled && documentState === 'hidden') {
       stopScanning();
       setWasAutoPaused(true);
     } else if (wasAutoPaused && documentState === 'visible') {
@@ -128,12 +128,12 @@ export function QrCodeModal({
             icon: <IconX />
           });
         });
-      setIsScanning(true);
+      setScanningEnabled(true);
     }
   }
 
   function stopScanning() {
-    if (qrCodeScanner && ScanningEnabled) {
+    if (qrCodeScanner && scanningEnabled) {
       qrCodeScanner.stop().catch((err: string) => {
         showNotification({
           title: t`Error while stopping`,
@@ -142,7 +142,7 @@ export function QrCodeModal({
           icon: <IconX />
         });
       });
-      setIsScanning(false);
+      setScanningEnabled(false);
     }
   }
 
@@ -151,7 +151,7 @@ export function QrCodeModal({
       <Group>
         <Text size="sm">{camId?.label}</Text>
         <Space style={{ flex: 1 }} />
-        <Badge>{ScanningEnabled ? t`Scanning` : t`Not scanning`}</Badge>
+        <Badge>{scanningEnabled ? t`Scanning` : t`Not scanning`}</Badge>
       </Group>
       <Container px={0} id="reader" w={'100%'} mih="300px" />
       {!camId ? (
@@ -164,14 +164,14 @@ export function QrCodeModal({
             <Button
               style={{ flex: 1 }}
               onClick={() => startScanning()}
-              disabled={camId != undefined && ScanningEnabled}
+              disabled={camId != undefined && scanningEnabled}
             >
               <Trans>Start scanning</Trans>
             </Button>
             <Button
               style={{ flex: 1 }}
               onClick={() => stopScanning()}
-              disabled={!ScanningEnabled}
+              disabled={!scanningEnabled}
             >
               <Trans>Stop scanning</Trans>
             </Button>

src/frontend/src/components/nav/Header.tsx

@@ -2,7 +2,7 @@ import { ActionIcon, Container, Group, Indicator, Tabs } from '@mantine/core';
 import { useDisclosure } from '@mantine/hooks';
 import { IconBell, IconSearch } from '@tabler/icons-react';
 import { useQuery } from '@tanstack/react-query';
-import { useEffect, useState } from 'react';
+import { ReactNode, useEffect, useMemo, useState } from 'react';
 import { useMatch, useNavigate } from 'react-router-dom';
 
 import { api } from '../../App';
@@ -132,10 +132,35 @@ export function Header() {
 }
 
 function NavTabs() {
+  const user = useUserState();
   const navigate = useNavigate();
   const match = useMatch(':tabName/*');
   const tabValue = match?.params.tabName;
 
+  const tabs: ReactNode[] = useMemo(() => {
+    let _tabs: ReactNode[] = [];
+
+    mainNavTabs.forEach((tab) => {
+      if (tab.role && !user.hasViewRole(tab.role)) {
+        return;
+      }
+
+      _tabs.push(
+        <Tabs.Tab
+          value={tab.name}
+          key={tab.name}
+          onClick={(event: any) =>
+            navigateToLink(`/${tab.name}`, navigate, event)
+          }
+        >
+          {tab.text}
+        </Tabs.Tab>
+      );
+    });
+
+    return _tabs;
+  }, [mainNavTabs, user]);
+
   return (
     <Tabs
       defaultValue="home"
@@ -146,19 +171,7 @@ function NavTabs() {
       }}
       value={tabValue}
     >
-      <Tabs.List>
+      <Tabs.List>{tabs.map((tab) => tab)}</Tabs.List>
-        {mainNavTabs.map((tab) => (
-          <Tabs.Tab
-            value={tab.name}
-            key={tab.name}
-            onClick={(event: any) =>
-              navigateToLink(`/${tab.name}`, navigate, event)
-            }
-          >
-            {tab.text}
-          </Tabs.Tab>
-        ))}
-      </Tabs.List>
     </Tabs>
   );
 }

src/frontend/src/components/nav/NotificationDrawer.tsx

@@ -7,7 +7,6 @@ import {
   Drawer,
   Group,
   Loader,
-  LoadingOverlay,
   Space,
   Stack,
   Text,

src/frontend/src/components/render/Instance.tsx

@@ -1,6 +1,6 @@
 import { t } from '@lingui/macro';
 import { Alert, Anchor, Group, Skeleton, Space, Text } from '@mantine/core';
-import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 import { ReactNode, useCallback } from 'react';
 
 import { api } from '../../App';

src/frontend/src/components/render/Part.tsx

@@ -15,7 +15,7 @@ export function RenderPart(
   const { instance } = props;
 
   let badgeText = '';
-  let badgeColor = 'green';
+  let badgeColor = '';
 
   let stock = instance.total_in_stock;
 

src/frontend/src/defaults/links.tsx

@@ -3,6 +3,7 @@ import { openContextModal } from '@mantine/modals';
 
 import { DocumentationLinkItem } from '../components/items/DocumentationLinks';
 import { StylishText } from '../components/items/StylishText';
+import { UserRoles } from '../enums/Roles';
 import { IS_DEV_OR_DEMO } from '../main';
 
 export const footerLinks = [
@@ -25,12 +26,17 @@ export const footerLinks = [
 export const navTabs = [
   { text: <Trans>Home</Trans>, name: 'home' },
   { text: <Trans>Dashboard</Trans>, name: 'dashboard' },
-  { text: <Trans>Parts</Trans>, name: 'part' },
+  { text: <Trans>Parts</Trans>, name: 'part', role: UserRoles.part },
-  { text: <Trans>Stock</Trans>, name: 'stock' },
+  { text: <Trans>Stock</Trans>, name: 'stock', role: UserRoles.stock },
-  { text: <Trans>Build</Trans>, name: 'build' },
+  { text: <Trans>Build</Trans>, name: 'build', role: UserRoles.build },
-  { text: <Trans>Purchasing</Trans>, name: 'purchasing' },
+  {
-  { text: <Trans>Sales</Trans>, name: 'sales' }
+    text: <Trans>Purchasing</Trans>,
+    name: 'purchasing',
+    role: UserRoles.purchase_order
+  },
+  { text: <Trans>Sales</Trans>, name: 'sales', role: UserRoles.sales_order }
 ];
+
 if (IS_DEV_OR_DEMO) {
   navTabs.push({ text: <Trans>Playground</Trans>, name: 'playground' });
 }

src/frontend/src/forms/BuildForms.tsx

@@ -1,5 +1,5 @@
 import { t } from '@lingui/macro';
-import { ActionIcon, Alert, Stack, Text } from '@mantine/core';
+import { Alert, Stack, Text } from '@mantine/core';
 import {
   IconCalendar,
   IconLink,

src/frontend/src/forms/PurchaseOrderForms.tsx

@@ -33,10 +33,7 @@ import {
   ApiFormAdjustFilterType,
   ApiFormFieldSet
 } from '../components/forms/fields/ApiFormField';
-import {
+import { TableFieldExtraRow } from '../components/forms/fields/TableField';
-  TableField,
-  TableFieldExtraRow
-} from '../components/forms/fields/TableField';
 import { Thumbnail } from '../components/images/Thumbnail';
 import { ProgressBar } from '../components/items/ProgressBar';
 import { StylishText } from '../components/items/StylishText';

src/frontend/src/forms/StockForms.tsx

@@ -7,13 +7,10 @@ import { Suspense, useCallback, useMemo, useState } from 'react';
 
 import { api } from '../App';
 import { ActionButton } from '../components/buttons/ActionButton';
-import { StandaloneField } from '../components/forms/StandaloneField';
 import {
   ApiFormAdjustFilterType,
-  ApiFormField,
   ApiFormFieldSet
 } from '../components/forms/fields/ApiFormField';
-import { ChoiceField } from '../components/forms/fields/ChoiceField';
 import { TableFieldExtraRow } from '../components/forms/fields/TableField';
 import { Thumbnail } from '../components/images/Thumbnail';
 import { StylishText } from '../components/items/StylishText';

src/frontend/src/hooks/UseImportSession.tsx

@@ -1,8 +1,6 @@
 import { useCallback, useMemo } from 'react';
 
-import { api } from '../App';
 import { ApiEndpoints } from '../enums/ApiEndpoints';
-import { apiUrl } from '../states/ApiState';
 import { useInstance } from './UseInstance';
 
 /*

src/frontend/src/hooks/UseInstance.tsx

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useState } from 'react';
 
 import { api } from '../App';
 import { ApiEndpoints } from '../enums/ApiEndpoints';

src/frontend/src/pages/Auth/Logged-In.tsx

@@ -14,7 +14,6 @@ export default function Logged_In() {
   }, [navigate]);
 
   return (
-    <>
     <Container>
       <Stack align="center">
         <Card shadow="sm" padding="lg" radius="md">
@@ -29,6 +28,5 @@ export default function Logged_In() {
         </Card>
       </Stack>
     </Container>
-    </>
   );
 }

src/frontend/src/pages/Auth/Logout.tsx

@@ -14,7 +14,6 @@ export default function Logout() {
   }, []);
 
   return (
-    <>
     <Container>
       <Stack align="center">
         <Card shadow="sm" padding="lg" radius="md">
@@ -29,6 +28,5 @@ export default function Logout() {
         </Card>
       </Stack>
     </Container>
-    </>
   );
 }

src/frontend/src/pages/Index/Playground.tsx

@@ -146,7 +146,6 @@ function ApiFormsPlayground() {
 function StatusLabelPlayground() {
   const [status, setStatus] = useState<string>('10');
   return (
-    <>
     <Group>
       <Text>Stock Status</Text>
       <TextInput
@@ -155,7 +154,6 @@ function StatusLabelPlayground() {
       />
       <StatusRenderer type={ModelType.stockitem} status={status} />
     </Group>
-    </>
   );
 }
 
@@ -202,14 +200,12 @@ function PlaygroundArea({
   content: ReactNode;
 }) {
   return (
-    <>
     <Accordion.Item value={`accordion-playground-${title}`}>
       <Accordion.Control>
         <Text>{title}</Text>
       </Accordion.Control>
       <Accordion.Panel>{content}</Accordion.Panel>
     </Accordion.Item>
-    </>
   );
 }
 

src/frontend/src/pages/Index/Scan.tsx

@@ -41,7 +41,7 @@ import {
 } from '@tabler/icons-react';
 import { Html5Qrcode } from 'html5-qrcode';
 import { CameraDevice } from 'html5-qrcode/camera/core';
-import { ReactNode, useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { api } from '../../App';
 import { DocInfo } from '../../components/items/DocInfo';
@@ -553,7 +553,7 @@ function InputImageBarcode({ action }: Readonly<ScanInputInterface>) {
   });
   const [cameras, setCameras] = useState<any[]>([]);
   const [cameraValue, setCameraValue] = useState<string | null>(null);
-  const [ScanningEnabled, setIsScanning] = useState<boolean>(false);
+  const [scanningEnabled, setScanningEnabled] = useState<boolean>(false);
   const [wasAutoPaused, setWasAutoPaused] = useState<boolean>(false);
   const documentState = useDocumentVisibility();
 
@@ -580,7 +580,7 @@ function InputImageBarcode({ action }: Readonly<ScanInputInterface>) {
 
   // Stop/start when leaving or reentering page
   useEffect(() => {
-    if (ScanningEnabled && documentState === 'hidden') {
+    if (scanningEnabled && documentState === 'hidden') {
       btnStopScanning();
       setWasAutoPaused(true);
     } else if (wasAutoPaused && documentState === 'visible') {
@@ -642,7 +642,7 @@ function InputImageBarcode({ action }: Readonly<ScanInputInterface>) {
   }
 
   function btnStartScanning() {
-    if (camId && qrCodeScanner && !ScanningEnabled) {
+    if (camId && qrCodeScanner && !scanningEnabled) {
       qrCodeScanner
         .start(
           camId.id,
@@ -662,12 +662,12 @@ function InputImageBarcode({ action }: Readonly<ScanInputInterface>) {
             icon: <IconX />
           });
         });
-      setIsScanning(true);
+      setScanningEnabled(true);
     }
   }
 
   function btnStopScanning() {
-    if (qrCodeScanner && ScanningEnabled) {
+    if (qrCodeScanner && scanningEnabled) {
       qrCodeScanner.stop().catch((err: string) => {
         showNotification({
           title: t`Error while stopping`,
@@ -676,7 +676,7 @@ function InputImageBarcode({ action }: Readonly<ScanInputInterface>) {
           icon: <IconX />
         });
       });
-      setIsScanning(false);
+      setScanningEnabled(false);
     }
   }
 
@@ -690,7 +690,7 @@ function InputImageBarcode({ action }: Readonly<ScanInputInterface>) {
     const cam = cameras.find((cam) => cam.id === cameraValue);
 
     // stop scanning if cam changed while scanning
-    if (qrCodeScanner && ScanningEnabled) {
+    if (qrCodeScanner && scanningEnabled) {
       // stop scanning
       qrCodeScanner.stop().then(() => {
         // change ID
@@ -723,7 +723,7 @@ function InputImageBarcode({ action }: Readonly<ScanInputInterface>) {
           })}
           size="sm"
         />
-        {ScanningEnabled ? (
+        {scanningEnabled ? (
           <ActionIcon
             onClick={btnStopScanning}
             title={t`Stop scanning`}
@@ -742,8 +742,8 @@ function InputImageBarcode({ action }: Readonly<ScanInputInterface>) {
           </ActionIcon>
         )}
         <Space style={{ flex: 1 }} />
-        <Badge color={ScanningEnabled ? 'green' : 'orange'}>
+        <Badge color={scanningEnabled ? 'green' : 'orange'}>
-          {ScanningEnabled ? t`Scanning` : t`Not scanning`}
+          {scanningEnabled ? t`Scanning` : t`Not scanning`}
         </Badge>
       </Group>
       <Container px={0} id="reader" w={'100%'} mih="300px" />

src/frontend/src/pages/Index/Settings/AccountSettings/SecurityContent.tsx

@@ -204,7 +204,7 @@ function EmailContent() {
 
 function SsoContent({ dataProvider }: { dataProvider: any | undefined }) {
   const [value, setValue] = useState<string>('');
-  const [currentProviders, setcurrentProviders] = useState<[]>();
+  const [currentProviders, setCurrentProviders] = useState<[]>();
   const { isLoading, data } = useQuery({
     queryKey: ['sso-list'],
     queryFn: () =>
@@ -225,7 +225,7 @@ function SsoContent({ dataProvider }: { dataProvider: any | undefined }) {
     // remove providers that are used currently
     let newData = dataProvider.providers;
     newData = newData.filter(isAlreadyInUse);
-    setcurrentProviders(newData);
+    setCurrentProviders(newData);
   }, [dataProvider, data]);
 
   function removeProvider() {

src/frontend/src/pages/Index/Settings/UserSettings.tsx

@@ -120,7 +120,6 @@ export default function UserSettings() {
   }
 
   return (
-    <>
     <Stack gap="xs">
       <SettingsHeader
         title={t`Account Settings`}
@@ -132,6 +131,5 @@ export default function UserSettings() {
       />
       <PanelGroup pageKey="user-settings" panels={userSettingsPanels} />
     </Stack>
-    </>
   );
 }

src/frontend/src/pages/Notifications.tsx

@@ -147,11 +147,9 @@ export default function NotificationsPage() {
   }, [unreadTable, readTable]);
 
   return (
-    <>
     <Stack>
       <PageDetail title={t`Notifications`} />
       <PanelGroup pageKey="notifications" panels={notificationPanels} />
     </Stack>
-    </>
   );
 }

src/frontend/src/pages/build/BuildIndex.tsx

@@ -1,19 +1,26 @@
 import { t } from '@lingui/macro';
 import { Stack } from '@mantine/core';
 
+import PermissionDenied from '../../components/errors/PermissionDenied';
 import { PageDetail } from '../../components/nav/PageDetail';
+import { UserRoles } from '../../enums/Roles';
+import { useUserState } from '../../states/UserState';
 import { BuildOrderTable } from '../../tables/build/BuildOrderTable';
 
 /**
  * Build Order index page
  */
 export default function BuildIndex() {
+  const user = useUserState();
+
+  if (!user.isLoggedIn() || !user.hasViewRole(UserRoles.build)) {
+    return <PermissionDenied />;
+  }
+
   return (
-    <>
     <Stack>
       <PageDetail title={t`Build Orders`} actions={[]} />
       <BuildOrderTable />
     </Stack>
-    </>
   );
 }

src/frontend/src/pages/company/CompanyDetail.tsx

@@ -39,7 +39,6 @@ import { UserRoles } from '../../enums/Roles';
 import { companyFields } from '../../forms/CompanyForms';
 import { useEditApiFormModal } from '../../hooks/UseForm';
 import { useInstance } from '../../hooks/UseInstance';
-import { apiUrl } from '../../states/ApiState';
 import { useUserState } from '../../states/UserState';
 import { AddressTable } from '../../tables/company/AddressTable';
 import { ContactTable } from '../../tables/company/ContactTable';

src/frontend/src/pages/part/PartPricingPanel.tsx

@@ -31,11 +31,7 @@ export enum panelOptions {
 export default function PartPricingPanel({ part }: { part: any }) {
   const user = useUserState();
 
-  const {
+  const { instance: pricing, instanceQuery } = useInstance({
-    instance: pricing,
-    refreshInstance,
-    instanceQuery
-  } = useInstance({
     pk: part?.pk,
     hasPrimaryKey: true,
     endpoint: ApiEndpoints.part_pricing_get,

src/frontend/src/pages/part/pricing/BomPricingPanel.tsx

@@ -12,11 +12,7 @@ import { ReactNode, useMemo, useState } from 'react';
 
 import { CHART_COLORS } from '../../../components/charts/colors';
 import { tooltipFormatter } from '../../../components/charts/tooltipFormatter';
-import {
+import { formatDecimal, formatPriceRange } from '../../../defaults/formatters';
-  formatCurrency,
-  formatDecimal,
-  formatPriceRange
-} from '../../../defaults/formatters';
 import { ApiEndpoints } from '../../../enums/ApiEndpoints';
 import { ModelType } from '../../../enums/ModelType';
 import { useTable } from '../../../hooks/UseTable';

src/frontend/src/pages/purchasing/PurchasingIndex.tsx

@@ -7,12 +7,17 @@ import {
 } from '@tabler/icons-react';
 import { useMemo } from 'react';
 
+import PermissionDenied from '../../components/errors/PermissionDenied';
 import { PageDetail } from '../../components/nav/PageDetail';
 import { PanelGroup } from '../../components/nav/PanelGroup';
+import { UserRoles } from '../../enums/Roles';
+import { useUserState } from '../../states/UserState';
 import { CompanyTable } from '../../tables/company/CompanyTable';
 import { PurchaseOrderTable } from '../../tables/purchasing/PurchaseOrderTable';
 
 export default function PurchasingIndex() {
+  const user = useUserState();
+
   const panels = useMemo(() => {
     return [
       {
@@ -46,12 +51,14 @@ export default function PurchasingIndex() {
     ];
   }, []);
 
+  if (!user.isLoggedIn() || !user.hasViewRole(UserRoles.purchase_order)) {
+    return <PermissionDenied />;
+  }
+
   return (
-    <>
     <Stack>
       <PageDetail title={t`Purchasing`} />
       <PanelGroup pageKey="purchasing-index" panels={panels} />
     </Stack>
-    </>
   );
 }

src/frontend/src/pages/sales/SalesIndex.tsx

@@ -7,13 +7,18 @@ import {
 } from '@tabler/icons-react';
 import { useMemo } from 'react';
 
+import PermissionDenied from '../../components/errors/PermissionDenied';
 import { PageDetail } from '../../components/nav/PageDetail';
 import { PanelGroup } from '../../components/nav/PanelGroup';
+import { UserRoles } from '../../enums/Roles';
+import { useUserState } from '../../states/UserState';
 import { CompanyTable } from '../../tables/company/CompanyTable';
 import { ReturnOrderTable } from '../../tables/sales/ReturnOrderTable';
 import { SalesOrderTable } from '../../tables/sales/SalesOrderTable';
 
 export default function PurchasingIndex() {
+  const user = useUserState();
+
   const panels = useMemo(() => {
     return [
       {
@@ -39,12 +44,14 @@ export default function PurchasingIndex() {
     ];
   }, []);
 
+  if (!user.isLoggedIn() || !user.hasViewRole(UserRoles.sales_order)) {
+    return <PermissionDenied />;
+  }
+
   return (
-    <>
     <Stack>
       <PageDetail title={t`Sales`} />
       <PanelGroup pageKey="sales-index" panels={panels} />
     </Stack>
-    </>
   );
 }

src/frontend/src/tables/DownloadAction.tsx

@@ -1,5 +1,4 @@
 import { t } from '@lingui/macro';
-import { ActionIcon, Menu, Tooltip } from '@mantine/core';
 import {
   IconDownload,
   IconFileSpreadsheet,
@@ -33,12 +32,10 @@ export function DownloadAction({
   }, [formatOptions, downloadCallback]);
 
   return (
-    <>
     <ActionDropdown
       tooltip={t`Download Data`}
       icon={<IconDownload />}
       actions={actions}
     />
-    </>
   );
 }

src/frontend/src/tables/UploadAction.tsx

@@ -4,9 +4,5 @@ import { IconUpload } from '@tabler/icons-react';
 import { ActionButton } from '../components/buttons/ActionButton';
 
 export function UploadAction({}) {
-  return (
+  return <ActionButton icon={<IconUpload />} tooltip={t`Upload Data`} />;
-    <>
-      <ActionButton icon={<IconUpload />} tooltip={t`Upload Data`} />
-    </>
-  );
 }

src/frontend/src/tables/general/AttachmentTable.tsx

@@ -8,7 +8,7 @@ import {
   IconUpload,
   IconX
 } from '@tabler/icons-react';
-import { ReactNode, useCallback, useEffect, useMemo, useState } from 'react';
+import { ReactNode, useCallback, useMemo, useState } from 'react';
 
 import { api } from '../../App';
 import { ActionButton } from '../../components/buttons/ActionButton';
@@ -28,7 +28,7 @@ import { useUserState } from '../../states/UserState';
 import { TableColumn } from '../Column';
 import { TableFilter } from '../Filter';
 import { InvenTreeTable } from '../InvenTreeTable';
-import { RowAction, RowDeleteAction, RowEditAction } from '../RowActions';
+import { RowDeleteAction, RowEditAction } from '../RowActions';
 
 /**
  * Define set of columns to display for the attachment table

src/frontend/src/tables/part/PartThumbTable.tsx

@@ -128,13 +128,13 @@ export function PartThumbTable({
   pk,
   setImage
 }: ThumbTableProps) {
-  const [img, selectImage] = useState<string | null>(null);
+  const [thumbImage, setThumbImage] = useState<string | null>(null);
   const [filterInput, setFilterInput] = useState<string>('');
-  const [filterQuery, setFilter] = useState<string>(search);
+  const [filterQuery, setFilterQuery] = useState<string>(search);
 
   // Keep search filters from updating while user is typing
   useEffect(() => {
-    const timeoutId = setTimeout(() => setFilter(filterInput), 500);
+    const timeoutId = setTimeout(() => setFilterQuery(filterInput), 500);
     return () => clearTimeout(timeoutId);
   }, [filterInput]);
 
@@ -160,7 +160,6 @@ export function PartThumbTable({
       <Suspense>
         <Divider />
         <Paper p="sm">
-          <>
           <SimpleGrid cols={8}>
             {!thumbQuery.isFetching
               ? thumbQuery.data?.data.map(
@@ -168,8 +167,8 @@ export function PartThumbTable({
                     <PartThumbComponent
                       element={data}
                       key={index}
-                        selected={img}
+                      selected={thumbImage}
-                        selectImage={selectImage}
+                      selectImage={setThumbImage}
                     />
                   )
                 )
@@ -183,7 +182,6 @@ export function PartThumbTable({
                   />
                 ))}
           </SimpleGrid>
-          </>
         </Paper>
       </Suspense>
 
@@ -197,8 +195,8 @@ export function PartThumbTable({
             }}
           />
           <Button
-            disabled={!img}
+            disabled={!thumbImage}
-            onClick={() => setNewImage(img, pk, setImage)}
+            onClick={() => setNewImage(thumbImage, pk, setImage)}
           >
             <Trans>Select</Trans>
           </Button>

src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx

@@ -1,6 +1,5 @@
 import { t } from '@lingui/macro';
 import { Text } from '@mantine/core';
-import { Action } from '@mdxeditor/editor';
 import { IconFileArrowLeft, IconSquareArrowRight } from '@tabler/icons-react';
 import { useCallback, useMemo, useState } from 'react';
 

src/frontend/src/tables/settings/ImportSessionTable.tsx

@@ -25,7 +25,6 @@ import { RowAction, RowDeleteAction } from '../RowActions';
 
 export default function ImportSesssionTable() {
   const table = useTable('importsession');
-  const user = useUserState();
 
   const [opened, setOpened] = useState<boolean>(false);
 

src/frontend/src/tables/stock/InstalledItemsTable.tsx

@@ -50,7 +50,6 @@ export default function InstalledItemsTable({
   }, [user]);
 
   return (
-    <>
     <InvenTreeTable
       url={apiUrl(ApiEndpoints.stock_item_list)}
       tableState={table}
@@ -64,6 +63,5 @@ export default function InstalledItemsTable({
         }
       }}
     />
-    </>
   );
 }

src/frontend/tests/login.ts

@@ -1,5 +1,5 @@
 import { expect } from './baseFixtures.js';
-import { baseUrl, loginUrl, logoutUrl, user } from './defaults';
+import { baseUrl, logoutUrl, user } from './defaults';
 
 /*
  * Perform form based login operation from the "login" URL

src/frontend/tests/pui_basic.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test } from './baseFixtures.js';
-import { baseUrl, loginUrl, user } from './defaults.js';
+import { baseUrl, user } from './defaults.js';
 import { doLogin, doQuickLogin } from './login.js';
 
 test('PUI - Basic Login Test', async ({ page }) => {

src/frontend/tests/pui_general.spec.ts

@@ -1,6 +1,6 @@
 import { test } from './baseFixtures.js';
 import { baseUrl } from './defaults.js';
-import { doLogout, doQuickLogin } from './login.js';
+import { doQuickLogin } from './login.js';
 
 test('PUI - Parts', async ({ page }) => {
   await doQuickLogin(page);

src/frontend/tests/pui_settings.spec.ts

@@ -1,6 +1,6 @@
 import { test } from './baseFixtures.js';
 import { baseUrl } from './defaults.js';
-import { doLogout, doQuickLogin } from './login.js';
+import { doQuickLogin } from './login.js';
 
 test('PUI - Admin', async ({ page }) => {
   // Note here we login with admin access