Small typescript cleanups (#7685)

* cleanup typescript:S1128

* fix typescript:S1854

* clean up typescript:S6749

* fix names for typescript:S6754
This commit is contained in:
Matthias Mair 2024-07-19 00:50:53 +02:00 committed by GitHub
parent 0f1645e389
commit 0a2817dbf3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
42 changed files with 198 additions and 260 deletions

View File

@ -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>

View File

@ -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';

View File

@ -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';

View File

@ -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}
onClick={() => setFile(null)}
disabled={!currentFile}
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) &&
hasOverlay &&
hovered && (
{permissions.hasChangeRole(props.appRole) && hasOverlay && hovered && (
<Overlay color="black" opacity={0.8} onClick={expandImage}>
<ImageActionButtons
visible={hovered}
@ -379,6 +381,5 @@ export function DetailsImage(props: Readonly<DetailImageProps>) {
)}
</>
</AspectRatio>
</>
);
}

View File

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

View File

@ -1,15 +1,7 @@
import { t } from '@lingui/macro';
import {
Alert,
FileInput,
NumberInput,
Stack,
Switch,
TextInput
} from '@mantine/core';
import { Alert, FileInput, NumberInput, Stack, Switch } 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';

View File

@ -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';

View File

@ -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>
</>
);
}

View File

@ -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';

View File

@ -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>

View File

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

View File

@ -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';

View File

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

View File

@ -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,

View File

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

View File

@ -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';

View File

@ -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';
/*

View File

@ -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';

View File

@ -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>
</>
);
}

View File

@ -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>
</>
);
}

View File

@ -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>
</>
);
}

View File

@ -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'}>
{ScanningEnabled ? t`Scanning` : t`Not scanning`}
<Badge color={scanningEnabled ? 'green' : 'orange'}>
{scanningEnabled ? t`Scanning` : t`Not scanning`}
</Badge>
</Group>
<Container px={0} id="reader" w={'100%'} mih="300px" />

View File

@ -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() {

View File

@ -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>
</>
);
}

View File

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

View File

@ -9,11 +9,9 @@ import { BuildOrderTable } from '../../tables/build/BuildOrderTable';
*/
export default function BuildIndex() {
return (
<>
<Stack>
<PageDetail title={t`Build Orders`} actions={[]} />
<BuildOrderTable />
</Stack>
</>
);
}

View File

@ -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';

View File

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

View File

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

View File

@ -47,11 +47,9 @@ export default function PurchasingIndex() {
}, []);
return (
<>
<Stack>
<PageDetail title={t`Purchasing`} />
<PanelGroup pageKey="purchasing-index" panels={panels} />
</Stack>
</>
);
}

View File

@ -40,11 +40,9 @@ export default function PurchasingIndex() {
}, []);
return (
<>
<Stack>
<PageDetail title={t`Sales`} />
<PanelGroup pageKey="sales-index" panels={panels} />
</Stack>
</>
);
}

View File

@ -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}
/>
</>
);
}

View File

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

View File

@ -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

View File

@ -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}
selectImage={selectImage}
selected={thumbImage}
selectImage={setThumbImage}
/>
)
)
@ -183,7 +182,6 @@ export function PartThumbTable({
/>
))}
</SimpleGrid>
</>
</Paper>
</Suspense>
@ -197,8 +195,8 @@ export function PartThumbTable({
}}
/>
<Button
disabled={!img}
onClick={() => setNewImage(img, pk, setImage)}
disabled={!thumbImage}
onClick={() => setNewImage(thumbImage, pk, setImage)}
>
<Trans>Select</Trans>
</Button>

View File

@ -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';

View File

@ -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);

View File

@ -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({
}
}}
/>
</>
);
}

View File

@ -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

View File

@ -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 }) => {

View File

@ -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);

View File

@ -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