Merge pull request #57 from koellemichael/dev

Dev

app/autocorrection.ts

@@ -64,7 +64,7 @@ export default class AutoCorrection {
       );
     });
 
-    ipcMain.on(AUTOCORRECTION_CANCEL, (event: IpcMainEvent, arg) => {
+    ipcMain.on(AUTOCORRECTION_CANCEL, (event: IpcMainEvent) => {
       const { sender } = event;
       this.cancelRequest = true;
       sender.send(AUTOCORRECTION_CANCEL_PENDING);

app/components/ConditionalCommentSettings.tsx

@@ -2,16 +2,14 @@
 /* eslint-disable @typescript-eslint/no-empty-interface */
 /* eslint-disable react/jsx-props-no-spreading */
 import React from 'react';
-import { Theme, withStyles } from '@material-ui/core/styles';
 import AddCircleIcon from '@material-ui/icons/AddCircle';
 import Typography from '@material-ui/core/Typography';
 import {
-  Fade,
   Grid,
   IconButton,
   Paper,
   Slider,
-  Tooltip,
+  Theme,
   useTheme,
 } from '@material-ui/core';
 import { useDispatch, useSelector } from 'react-redux';
@@ -22,7 +20,12 @@ import {
   settingsUpdateConditionalCommentValue,
 } from '../model/SettingsSlice';
 
-function ValueLabelComponent(props: any) {
+function ValueLabelComponent(props: {
+  children;
+  value: number;
+  comments: string[];
+  theme: Theme;
+}) {
   const { children, value, comments, theme } = props;
   return (
     <>

app/components/ConditionalCommentTextInput.tsx

@@ -2,7 +2,6 @@
 /* eslint-disable react/prop-types */
 import { IconButton, TextField } from '@material-ui/core';
 import CancelIcon from '@material-ui/icons/Cancel';
-import { relative } from 'path';
 import React, { useState } from 'react';
 import { useDispatch } from 'react-redux';
 import ConditionalComment from '../model/ConditionalComment';

app/components/LoadingItem.tsx

@@ -2,7 +2,12 @@ import { Grid, CircularProgress, Typography } from '@material-ui/core';
 import React from 'react';
 import DoneIcon from '@material-ui/icons/Done';
 
-export default function LoadingItem(props: any): JSX.Element {
+export type LoadingItemProps = {
+  complete: boolean;
+  message: string;
+};
+
+export default function LoadingItem(props: LoadingItemProps): JSX.Element {
   const { complete, message } = props;
   const loadingIcon = complete ? (
     <DoneIcon style={{ fill: 'black' }} />

app/components/LoadingItemList.tsx

@@ -1,16 +1,20 @@
 import { List, ListItem } from '@material-ui/core';
 import React from 'react';
-import LoadingItem from './LoadingItem';
+import LoadingItem, { LoadingItemProps } from './LoadingItem';
 
-export default function LoadingItemList(props: any): JSX.Element {
+type LoadingItemListProps = {
+  progress: (LoadingItemProps & { active: boolean })[];
+};
+
+export default function LoadingItemList(
+  props: LoadingItemListProps
+): JSX.Element {
   const { progress } = props;
-  const activeItems = progress.filter(
-    (item: { active: boolean }) => item.active
-  );
+  const activeItems = progress.filter((item) => item.active);
 
   return (
     <List>
-      {activeItems.map((item: { message: string; complete: boolean }) => {
+      {activeItems.map((item) => {
         return (
           <ListItem key={item.message}>
             <LoadingItem message={item.message} complete={item.complete} />

app/components/OutputFormatSelect.tsx

@@ -6,7 +6,7 @@ import {
   selectSettingsExport,
   settingsSetExport,
 } from '../model/SettingsSlice';
-import { ParserType } from '../parser/Parser';
+import ParserType from '../parser/ParserType';
 
 const OutputFormatSelect = () => {
   const dispatch = useDispatch();

app/containers/CorrectionViewPage.tsx

@@ -27,7 +27,6 @@ import {
 } from '../model/Selectors';
 
 import Sheet from '../model/Sheet';
-import { sheetsUpsertOne } from '../model/SheetSlice';
 import { serializeTerm } from '../utils/Formatter';
 import './SplitPane.css';
 
@@ -64,6 +63,7 @@ export default function CorrectionViewPage() {
         );
       }
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [index]);
 
   function handleCloseDialog() {

app/containers/OverviewPage.tsx

@@ -2,6 +2,6 @@
 import React from 'react';
 import Overview from '../features/overview/Overview';
 
-export default function OverviewPage(props: any) {
+export default function OverviewPage(props) {
   return <Overview {...props} />;
 }

app/containers/Root.tsx

@@ -6,6 +6,7 @@ import { AnyAction, EnhancedStore } from '@reduxjs/toolkit';
 import Providers from './Providers';
 
 type Props = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   store: EnhancedStore<any, AnyAction, any[]>;
   history: History;
 };

app/containers/TitleBar.tsx

@@ -8,6 +8,7 @@ import { useSelector } from 'react-redux';
 import { useTheme, Snackbar } from '@material-ui/core';
 import { remote } from 'electron';
 import { Alert } from '@material-ui/lab';
+import { MenuItem } from 'frameless-titlebar/dist/title-bar/typings';
 import {
   selectRecentPaths,
   selectWorkspacePath,
@@ -109,7 +110,7 @@ export default function TitleBar(props: TitleBarProps) {
             recentPaths,
             setOpenFileError,
             setReload
-          ) as any
+          ) as MenuItem[] | undefined
         }
         theme={{
           bar: {

app/exporter.ts

@@ -11,10 +11,11 @@ import {
 } from './constants/ExportIPC';
 import ConditionalComment from './model/ConditionalComment';
 import Correction from './model/Correction';
-import Parser, { ParserType } from './parser/Parser';
+import Parser from './parser/Parser';
 import instanciateParser from './parser/ParserUtil';
 import { serializeCorrection } from './utils/Formatter';
 import { loadFilesFromWorkspaceMainProcess } from './utils/FileAccess';
+import ParserType from './parser/ParserType';
 
 export interface ExportProgress {
   steps: {

app/features/correction/CorrectionOverview.tsx

@@ -49,6 +49,7 @@ export default function CorrectionOverview(props: CorrectionOverviewProps) {
         correction.status === Status.Marked
       )
     );
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [index]);
 
   const handleClick = () => {

app/features/media-viewer/PDFViewer.tsx

@@ -28,8 +28,10 @@ export default function PDFViewer(props: ViewerProps) {
     const textLayers = document.querySelectorAll(
       '.react-pdf__Page__textContent'
     );
-    textLayers.forEach((layer: any) => {
-      const { style } = layer;
+    textLayers.forEach((layer) => {
+      const { style } = (layer as unknown) as {
+        style: { top: string; left: string; transform: string };
+      };
       style.top = '0';
       style.left = '0';
       style.transform = '';

app/features/media-viewer/ViewerToolbar.tsx

@@ -113,6 +113,7 @@ export default function ViewerToolbar(props: ViewerToolbarProps) {
     return () => {
       window.removeEventListener('wheel', handleScrollEvent);
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   return (

app/importer.ts

@@ -10,7 +10,7 @@ import {
 } from 'electron';
 import { normalize } from 'normalizr';
 import Correction from './model/Correction';
-import Parser, { ParserType } from './parser/Parser';
+import Parser from './parser/Parser';
 import instanciateParser from './parser/ParserUtil';
 import {
   IMPORT_CONFLICTS,
@@ -27,6 +27,7 @@ import {
   getAllFilesInDirectory,
 } from './utils/FileAccess';
 import { CorrectionSchema } from './model/NormalizationSchema';
+import ParserType from './parser/ParserType';
 
 export interface ImportProgress {
   name: string;
@@ -82,6 +83,7 @@ export default class Importer {
     // Create new workspace file if no workspace is allocated yet
     if (workspacePath.length === 0) {
       const p: string | undefined = dialog.showSaveDialogSync(this.mainWindow, {
+        defaultPath: `${Path.parse(path).name}.cor`,
         filters: [{ name: 'Correctinator', extensions: ['cor'] }],
       });
       if (!p) {
@@ -162,7 +164,8 @@ export default class Importer {
       const content = fs.readFileSync(importPath, Importer.ENCODING);
       const correction: Correction = parser.deserialize(
         content,
-        Path.basename(Path.dirname(importPath))
+        Path.basename(Path.dirname(importPath)),
+        Path.basename(importPath)
       );
 
       // Were the submissions already imported?
@@ -224,7 +227,8 @@ export default class Importer {
       const content = zipEntry.getData().toString(Importer.ENCODING);
       const correction: Correction = parser.deserialize(
         content,
-        Path.basename(Path.dirname(zipEntry.entryName))
+        Path.basename(Path.dirname(zipEntry.entryName)),
+        Path.basename(zipEntry.entryName)
       );
 
       // Were the submissions already imported?
@@ -381,7 +385,8 @@ export default class Importer {
         const parser: Parser = instanciateParser(c.parser);
         const correction: Correction = parser.deserialize(
           content,
-          Path.basename(Path.dirname(c.path))
+          Path.basename(Path.dirname(c.path)),
+          Path.basename(c.path)
         );
         corrections.push(
           this.ingestCorrectionFromZip(
@@ -407,7 +412,8 @@ export default class Importer {
         const parser: Parser = instanciateParser(c.parser);
         const correction: Correction = parser.deserialize(
           content,
-          Path.basename(Path.dirname(c.path))
+          Path.basename(Path.dirname(c.path)),
+          Path.basename(c.path)
         );
         corrections.push(
           this.ingestCorrectionFromFolder(

app/menu.ts

@@ -26,11 +26,6 @@ export default class MenuBuilder {
       this.setupDevelopmentEnvironment();
     }
 
-    const template =
-      process.platform === 'darwin'
-        ? this.buildDarwinTemplate()
-        : this.buildDefaultTemplate();
-
     const menu = Menu.buildFromTemplate([]);
     Menu.setApplicationMenu(menu);
 

app/menu/FileMenu.ts

@@ -192,6 +192,7 @@ const buildFileMenu = (
       },
       {
         label: 'Close file',
+        disabled: !workspace,
         click: async () => {
           unsavedChangesDialog('');
         },

app/modals/AutoCorrectionModal.tsx

@@ -138,7 +138,7 @@ const AutoCorrectionModal: FC<AutoCorrectionModalProps> = ({ ...props }) => {
     ) => {
       setAutoCorrectionProgress(progress);
     };
-    const handleAutoCorrectionCancelPending = (_event: IpcRendererEvent) => {
+    const handleAutoCorrectionCancelPending = () => {
       setAutoCorrectionState(AutoCorrectionState.AUTOCORRECTION_CANCEL_PENDING);
     };
 
@@ -236,9 +236,10 @@ const AutoCorrectionModal: FC<AutoCorrectionModalProps> = ({ ...props }) => {
         handleProgress
       );
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  let content;
+  let content: JSX.Element | null;
 
   switch (autoCorrectionState) {
     case AutoCorrectionState.AUTOCORRECTION_STARTED:

app/modals/ExportModal.tsx

@@ -31,7 +31,6 @@ import DialogTitleWithCloseIcon from './DialogTitleWithCloseIcon';
 import { ModalProps } from './ModalProvider';
 import { selectCorrectionsBySheetId } from '../model/Selectors';
 import * as ExportIPC from '../constants/ExportIPC';
-import { ParserType } from '../parser/Parser';
 import { ExportProgress } from '../exporter';
 import CircularProgressWithLabel from '../components/CircularProgressWithLabel';
 import Status from '../model/Status';
@@ -41,8 +40,7 @@ import {
 } from '../model/SettingsSlice';
 import OutputFormatSelect from '../components/OutputFormatSelect';
 import ConditionalCommentSettings from '../components/ConditionalCommentSettings';
-import Correction from '../model/Correction';
-import { selectSheetById } from '../model/SheetSlice';
+import ParserType from '../parser/ParserType';
 
 type ExportModalProps = ModalProps & {
   sheetId: string;

app/modals/ImportModal.tsx

@@ -26,12 +26,12 @@ import {
 import { CorrectionsSchema } from '../model/NormalizationSchema';
 import { loadCorrections } from '../model/CorrectionsSlice';
 import CircularProgressWithLabel from '../components/CircularProgressWithLabel';
-import { ParserType } from '../parser/Parser';
 // eslint-disable-next-line import/no-cycle
 import OverwriteDuplicateSubmissionsDialog from '../dialogs/OverwriteDuplicateSubmissionsDialog';
 import ConfirmationDialog from '../dialogs/ConfirmationDialog';
 import { save } from '../utils/FileAccess';
 import { selectSettingsGeneral } from '../model/SettingsSlice';
+import ParserType from '../parser/ParserType';
 
 type ImportModalProps = ModalProps & {
   path?: string;
@@ -127,6 +127,7 @@ const ImportModal: FC<ImportModalProps> = ({ ...props }) => {
       ipcRenderer.removeListener(ImportIPC.IMPORT_FAILED, handleImportFailed);
       ipcRenderer.removeListener(ImportIPC.IMPORT_PROGRESS, handleProgress);
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   let content;

app/modals/ModalProvider.tsx

@@ -16,8 +16,9 @@ const ModalContext = createContext<
 
 export default function ModalProvider(props: ModalProviderProps) {
   const { children } = props;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const [Modal, setModal] = useState<any>(null);
-  const [modalOptions, setModalOptions] = useState<any>(null);
+  const [modalOptions, setModalOptions] = useState<unknown>(null);
 
   const openModal = <T extends unknown>(
     component: FC<T & ModalProps>,

app/modals/ReleaseNotesModal.tsx

@@ -52,6 +52,7 @@ const ReleaseNotesModal: FC<ReleaseNotesModalProps> = ({ ...props }) => {
       .catch(() => {
         setLoading(false);
       });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   let content: JSX.Element;

app/model/AnnotationSlice.tsx

@@ -29,7 +29,7 @@ const slice = createSlice({
         adapter.upsertMany(state, action.payload.annotations);
       }
     },
-    [deleteEntities.type]: (state, action) => {
+    [deleteEntities.type]: (state) => {
       adapter.removeAll(state);
     },
   },
@@ -53,6 +53,8 @@ export const {
   selectEntities: selectAnnotationEntities,
   selectAll: selectAllAnnotations,
   selectTotal: selectTotalAnnotations,
-} = adapter.getSelectors((state: any) => state.annotations);
+} = adapter.getSelectors(
+  (state: { annotations: EntityState<Annotation> }) => state.annotations
+);
 
 export default slice.reducer;

app/model/CommentSlice.tsx

@@ -1,5 +1,9 @@
 /* eslint-disable import/no-cycle */
-import { createEntityAdapter, createSlice } from '@reduxjs/toolkit';
+import {
+  createEntityAdapter,
+  createSlice,
+  EntityState,
+} from '@reduxjs/toolkit';
 import CommentEntity from './CommentEntity';
 import { loadCorrections, deleteEntities } from './CorrectionsSlice';
 
@@ -49,6 +53,8 @@ export const {
   selectEntities: selectCommentsEntities,
   selectAll: selectAllComments,
   selectTotal: selectTotalComments,
-} = adapter.getSelectors((state: any) => state.comments);
+} = adapter.getSelectors(
+  (state: { comments: EntityState<CommentEntity> }) => state.comments
+);
 
 export default slice.reducer;