Skip to content

Commit 57a9237

Browse files
committed
more linting
1 parent 55c0a65 commit 57a9237

27 files changed

+76
-66
lines changed

src/main.dev.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* eslint global-require: off, no-console: off */
2-
32
/**
43
* This module executes inside of electron's main process. You can start
54
* electron renderer process from here and communicate with the other processes
@@ -8,22 +7,24 @@
87
* When running `yarn build` or `yarn build-main`, this file is compiled to
98
* `./src/main.prod.js` using webpack. This gives us some performance wins.
109
*/
10+
import * as grpc from '@grpc/grpc-js';
11+
import * as Sentry from '@sentry/electron/main';
1112
import {
1213
app,
1314
BrowserWindow,
1415
dialog,
1516
ipcMain,
1617
MessageBoxOptions,
1718
} from 'electron';
18-
import * as grpc from '@grpc/grpc-js';
19-
import * as Sentry from '@sentry/electron/main';
19+
import contextMenu from 'electron-context-menu';
2020
import log from 'electron-log';
2121
import { autoUpdater } from 'electron-updater';
22+
import fs from 'fs';
2223
import { menubar } from 'menubar';
23-
import * as url from 'url';
2424
import path from 'path';
25-
import fs from 'fs';
26-
import contextMenu from 'electron-context-menu';
25+
import * as url from 'url';
26+
27+
import { start } from './cli';
2728
import createWindow from './renderer/window';
2829
import {
2930
isDev,
@@ -47,7 +48,6 @@ import {
4748
LISTENER_LOG,
4849
GET_ALL_RECORDS,
4950
} from './shared/constants';
50-
import Helper from './trayMenu/helper';
5151
import {
5252
ConnectionStatusUpdate,
5353
ExportRequest,
@@ -58,7 +58,7 @@ import {
5858
Selector,
5959
StatusUpdatesRequest,
6060
} from './shared/pb/api';
61-
import { start } from './cli';
61+
import Helper from './trayMenu/helper';
6262

6363
const SentryDSN =
6464
'https://[email protected]/6146413';
@@ -279,7 +279,7 @@ async function init(): Promise<void> {
279279
const bytes = fs.readFileSync(response.filePaths[0], null);
280280
configClient.import(
281281
{
282-
data: bytes,
282+
data: bytes as unknown as Uint8Array,
283283
} as ImportRequest,
284284
(err, res) => {
285285
evt?.sender?.send(IMPORT, { err, res });

src/renderer/components/BeforeBackActionDialog.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import DialogContent from '@mui/material/DialogContent';
55
import DialogTitle from '@mui/material/DialogTitle';
66
import Divider from '@mui/material/Divider';
77
import Typography from '@mui/material/Typography';
8-
import React, { ReactElement } from 'react';
98
import { ipcRenderer } from 'electron';
9+
import React, { ReactElement } from 'react';
10+
1011
import { VIEW_CONNECTION_LIST } from '../../shared/constants';
1112

1213
interface Props {

src/renderer/components/CertDetails.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import Button from '@mui/material/Button';
12
import Container from '@mui/material/Container';
23
import Dialog from '@mui/material/Dialog';
4+
import DialogActions from '@mui/material/DialogActions';
35
import DialogContent from '@mui/material/DialogContent';
46
import DialogTitle from '@mui/material/DialogTitle';
57
import Divider from '@mui/material/Divider';
@@ -10,8 +12,6 @@ import Typography from '@mui/material/Typography';
1012
import moment from 'moment';
1113
import React, { ReactElement } from 'react';
1214

13-
import DialogActions from '@mui/material/DialogActions';
14-
import Button from '@mui/material/Button';
1515
import { Certificate } from '../../shared/pb/api';
1616

1717
interface DetailViewDialogProps {

src/renderer/components/ConfirmationDialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React, { FC, ReactElement } from 'react';
21
import {
32
Dialog,
43
DialogTitle,
@@ -7,6 +6,7 @@ import {
76
DialogActions,
87
Button,
98
} from '@mui/material';
9+
import React, { FC, ReactElement } from 'react';
1010

1111
export interface ConfirmationDialogProps {
1212
title: string;

src/renderer/components/ConnectionRow.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React, { ReactElement } from 'react';
21
import {
32
Typography,
43
Grid,
@@ -9,10 +8,12 @@ import {
98
Tooltip,
109
Box,
1110
} from '@mui/material';
12-
import { Copy, MoreVertical } from 'react-feather';
1311
import { clipboard, ipcRenderer } from 'electron';
14-
import { Link } from 'react-router-dom';
1512
import { useSnackbar } from 'notistack';
13+
import React, { ReactElement } from 'react';
14+
import { Copy, MoreVertical } from 'react-feather';
15+
import { Link } from 'react-router-dom';
16+
1617
import {
1718
CONNECT,
1819
DELETE,
@@ -26,13 +27,13 @@ import {
2627
UPDATE_LISTENERS,
2728
VIEW,
2829
} from '../../shared/constants';
29-
import Connected from '../icons/Connected';
30-
import Disconnected from '../icons/Disconnected';
3130
import {
3231
ListenerUpdateRequest,
3332
Record as ListenerRecord,
3433
Connection,
3534
} from '../../shared/pb/api';
35+
import Connected from '../icons/Connected';
36+
import Disconnected from '../icons/Disconnected';
3637
import ExportDialog from './ExportDialog';
3738

3839
type ConnectionRowProps = {

src/renderer/components/ExportDialog.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/* eslint no-unused-vars: off */
2-
import { ipcRenderer, IpcRendererEvent } from 'electron';
32
import Button from '@mui/material/Button';
3+
import Checkbox from '@mui/material/Checkbox';
44
import Dialog from '@mui/material/Dialog';
55
import DialogActions from '@mui/material/DialogActions';
66
import DialogContent from '@mui/material/DialogContent';
77
import DialogTitle from '@mui/material/DialogTitle';
88
import Divider from '@mui/material/Divider';
9-
import React, { ReactElement, useState } from 'react';
10-
import Typography from '@mui/material/Typography';
11-
import Checkbox from '@mui/material/Checkbox';
12-
import FormGroup from '@mui/material/FormGroup';
139
import FormControlLabel from '@mui/material/FormControlLabel';
10+
import FormGroup from '@mui/material/FormGroup';
11+
import Typography from '@mui/material/Typography';
12+
import { ipcRenderer, IpcRendererEvent } from 'electron';
13+
import React, { ReactElement, useState } from 'react';
1414

1515
import { EXPORT, ExportFile } from '../../shared/constants';
1616

src/renderer/components/TagFolderRow.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import * as React from 'react';
2-
import { PropsWithChildren, ReactElement } from 'react';
31
import {
42
Divider,
53
Grid,
@@ -8,8 +6,11 @@ import {
86
MenuItem,
97
Typography,
108
} from '@mui/material';
11-
import { MoreVertical } from 'react-feather';
129
import { ipcRenderer } from 'electron';
10+
import * as React from 'react';
11+
import { PropsWithChildren, ReactElement } from 'react';
12+
import { MoreVertical } from 'react-feather';
13+
1314
import {
1415
CONNECT_ALL,
1516
DELETE_ALL,
@@ -18,9 +19,9 @@ import {
1819
ExportFile,
1920
UPDATE_LISTENERS,
2021
} from '../../shared/constants';
22+
import { ListenerUpdateRequest, Selector } from '../../shared/pb/api';
2123
import ClosedFolder from '../icons/ClosedFolder';
2224
import OpenFolder from '../icons/OpenFolder';
23-
import { ListenerUpdateRequest, Selector } from '../../shared/pb/api';
2425
import ConfirmationDialog, {
2526
ConfirmationDialogProps,
2627
} from './ConfirmationDialog';

src/renderer/components/TopBar.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* eslint-disable react/jsx-props-no-spreading */
22
import { AppBar, Autocomplete, Grid, TextField, Toolbar } from '@mui/material';
3+
import { createFilterOptions } from '@mui/material/useAutocomplete';
4+
import { ipcRenderer } from 'electron';
35
import React, { FC, useEffect, useState } from 'react';
4-
56
import { Search } from 'react-feather';
6-
import { ipcRenderer } from 'electron';
7-
import { createFilterOptions } from '@mui/material/useAutocomplete';
8-
import Logo from '../icons/Logo';
7+
98
import { GET_ALL_RECORDS, VIEW } from '../../shared/constants';
109
import { Record as ListenerRecord } from '../../shared/pb/api';
10+
import Logo from '../icons/Logo';
1111
import TopTabs from './TopTabs';
1212

1313
const TopBar: FC = () => {

src/renderer/components/TopTabs.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { AppBar, Grid, Tab, Tabs, Toolbar, Typography } from '@mui/material';
22
import React, { ReactElement } from 'react';
33
import { Link } from 'react-router-dom';
4+
45
import metadata from '../../meta.json';
56

67
function TopTabs(): ReactElement {

src/renderer/components/VirtualFolderRow.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import * as React from 'react';
21
import { Typography, Grid, IconButton, Divider } from '@mui/material';
2+
import * as React from 'react';
33
import { PropsWithChildren, ReactElement } from 'react';
4+
45
import VirtualClosedFolder from '../icons/VirtualClosedFolder';
56
import VirtualOpenFolder from '../icons/VirtualOpenFolder';
67

src/renderer/icons/ClosedFolder.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { SvgIcon } from '@mui/material';
2-
32
import React, { ReactElement } from 'react';
43

54
function ClosedFolder(): ReactElement {

src/renderer/icons/Connected.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { ReactElement } from 'react';
21
import { SvgIcon } from '@mui/material';
2+
import React, { ReactElement } from 'react';
33

44
function Connected(): ReactElement {
55
return (

src/renderer/icons/Delete.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { ReactElement } from 'react';
21
import { SvgIcon } from '@mui/material';
2+
import React, { ReactElement } from 'react';
33

44
function Delete(): ReactElement {
55
return (

src/renderer/icons/Disconnected.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { ReactElement } from 'react';
21
import { SvgIcon } from '@mui/material';
2+
import React, { ReactElement } from 'react';
33

44
function Disconnected(): ReactElement {
55
return (

src/renderer/icons/Edit.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { ReactElement } from 'react';
21
import { SvgIcon } from '@mui/material';
2+
import React, { ReactElement } from 'react';
33

44
function Edit(): ReactElement {
55
return (

src/renderer/icons/Export.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { ReactElement } from 'react';
21
import { SvgIcon } from '@mui/material';
2+
import React, { ReactElement } from 'react';
33

44
function Export(): ReactElement {
55
return (

src/renderer/icons/ExportJSON.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { ReactElement } from 'react';
21
import { SvgIcon } from '@mui/material';
2+
import React, { ReactElement } from 'react';
33

44
function Export(): ReactElement {
55
return (

src/renderer/icons/OpenFolder.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { ReactElement } from 'react';
21
import { SvgIcon } from '@mui/material';
2+
import React, { ReactElement } from 'react';
33

44
function OpenFolder(): ReactElement {
55
return (

src/renderer/icons/VirtualClosedFolder.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { ReactElement } from 'react';
21
import { SvgIcon } from '@mui/material';
2+
import React, { ReactElement } from 'react';
33

44
function VirtualClosedFolder(): ReactElement {
55
return (

src/renderer/icons/VirtualOpenFolder.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { ReactElement } from 'react';
21
import { SvgIcon } from '@mui/material';
2+
import React, { ReactElement } from 'react';
33

44
function VirtualOpenFolder(): ReactElement {
55
return (

src/renderer/menu.ts

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
BrowserWindow,
66
MenuItemConstructorOptions,
77
} from 'electron';
8+
89
import { isDev, prodDebug } from '../shared/constants';
910

1011
interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {

src/renderer/pages/ConnectionView.tsx

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React, { ReactElement, useEffect, useState } from 'react';
21
import {
32
Accordion,
43
AccordionDetails,
@@ -17,11 +16,12 @@ import {
1716
Stack,
1817
Typography,
1918
} from '@mui/material';
20-
import { useParams } from 'react-router-dom';
2119
import { ipcRenderer } from 'electron';
22-
import { AlertTriangle, ChevronDown, Info } from 'react-feather';
2320
import { useSnackbar } from 'notistack';
24-
import StyledCard from '../components/StyledCard';
21+
import React, { ReactElement, useEffect, useState } from 'react';
22+
import { AlertTriangle, ChevronDown, Info } from 'react-feather';
23+
import { useParams } from 'react-router-dom';
24+
2525
import {
2626
DELETE,
2727
EDIT,
@@ -34,24 +34,25 @@ import {
3434
UPDATE_LISTENERS,
3535
VIEW_CONNECTION_LIST,
3636
} from '../../shared/constants';
37-
import Connected from '../icons/Connected';
38-
import Disconnected from '../icons/Disconnected';
39-
import Edit from '../icons/Edit';
40-
import Export from '../icons/Export';
41-
import Delete from '../icons/Delete';
4237
import {
4338
Connection,
4439
ConnectionStatusUpdate,
4540
ListenerUpdateRequest,
4641
Record,
4742
Selector,
4843
} from '../../shared/pb/api';
49-
import ExportJSON from '../icons/ExportJSON';
5044
import CertDetails from '../components/CertDetails';
45+
import { getClientCertFiltersSummary } from '../components/ClientCertSelection';
5146
import ExportDialog, {
5247
IpcRendererEventListener,
5348
} from '../components/ExportDialog';
54-
import { getClientCertFiltersSummary } from '../components/ClientCertSelection';
49+
import StyledCard from '../components/StyledCard';
50+
import Connected from '../icons/Connected';
51+
import Delete from '../icons/Delete';
52+
import Disconnected from '../icons/Disconnected';
53+
import Edit from '../icons/Edit';
54+
import Export from '../icons/Export';
55+
import ExportJSON from '../icons/ExportJSON';
5556

5657
type SimplifiedLog = {
5758
status: 'info' | 'error';

src/renderer/pages/Layout.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { Box } from '@mui/material';
12
import React, { FC } from 'react';
23
import { Outlet } from 'react-router-dom';
3-
import { Box } from '@mui/material';
4+
45
import TopBar from '../components/TopBar';
56

67
const Layout: FC = () => {

0 commit comments

Comments
 (0)