Skip to content

Commit

Permalink
refactor: Extracted dialogs from CorrectionView
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelkoelle committed May 16, 2021
1 parent 1ba95d1 commit d6d8150
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 22 deletions.
11 changes: 11 additions & 0 deletions app/dialogs/OpenExportModalDialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const OpenExportModalDialog = (onExport) => {
return {
title: 'Export Corrections?',
text: `Seems like you are finished with the correction. Would you like to export the corrections?`,
onConfirm: () => {
onExport();
},
};
};

export default OpenExportModalDialog;
11 changes: 11 additions & 0 deletions app/dialogs/SkipUnreadFilesDialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const SkipUnreadFilesDialog = (onNext) => {
return {
title: 'Skip unread files?',
text: `There are still unread files for this submission. Are you sure you want to go to the next submission?`,
onConfirm: () => {
onNext(true);
},
};
};

export default SkipUnreadFilesDialog;
13 changes: 13 additions & 0 deletions app/effects/AutosaveCorrectionEffect.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { saveCorrectionToWorkspace } from '../utils/FileAccess';

const AutosaveCorrectionEffect = (autosave, corr, workspace) => {
return () => {
return () => {
if (corr && autosave) {
saveCorrectionToWorkspace(corr, workspace);
}
};
};
};

export default AutosaveCorrectionEffect;
33 changes: 11 additions & 22 deletions app/features/correction/CorrectionView.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable react-hooks/exhaustive-deps */
import {
Button,
Grid,
Expand All @@ -24,11 +25,13 @@ import { correctionPageSetIndex } from '../../model/CorrectionPageSlice';
import CorrectionComment from './CorrectionComment';
import TaskView from './TaskView';
import TimeElapsedDisplay from '../../components/TimeElapsedDisplay';
import { saveCorrectionToWorkspace } from '../../utils/FileAccess';
import { selectWorkspacePath } from '../workspace/workspaceSlice';
import { selectSettingsAutosave } from '../../model/SettingsSlice';
import { useModal } from '../../modals/ModalProvider';
import ConfirmationDialog from '../../dialogs/ConfirmationDialog';
import SkipUnreadFilesDialog from '../../dialogs/SkipUnreadFilesDialog';
import OpenExportModalDialog from '../../dialogs/OpenExportModalDialog';
import AutosaveCorrectionEffect from '../../effects/AutosaveCorrectionEffect';

type CorrectionViewProps = {
corrections: Correction[];
Expand All @@ -47,13 +50,11 @@ export default function CorrectionView(props: CorrectionViewProps) {
// Dialogs
const [openExportDialog, setOpenExportDialog] = useState(false);

useEffect(() => {
return () => {
if (corr && autosave) {
saveCorrectionToWorkspace(corr, workspace);
}
};
}, [autosave, corr, workspace]);
useEffect(AutosaveCorrectionEffect(autosave, corr, workspace), [
autosave,
corr,
workspace,
]);

function onExport() {
setOpenExportDialog(true);
Expand Down Expand Up @@ -103,13 +104,7 @@ export default function CorrectionView(props: CorrectionViewProps) {
undefined &&
!continueAnyways
) {
showModal(ConfirmationDialog, {
title: 'Skip unread files?',
text: `There are still unread files for this submission. Are you sure you want to go to the next submission?`,
onConfirm: () => {
onNext(true);
},
});
showModal(ConfirmationDialog, SkipUnreadFilesDialog(onNext));
return;
}
setStatusDone();
Expand All @@ -120,13 +115,7 @@ export default function CorrectionView(props: CorrectionViewProps) {
corrections.filter((c) => c?.status !== Status.Done).length === 0
) {
// Prompt to export and create zip
showModal(ConfirmationDialog, {
title: 'Export Corrections?',
text: `Seems like you are finished with the correction. Would you like to export the corrections?`,
onConfirm: () => {
onExport();
},
});
showModal(ConfirmationDialog, OpenExportModalDialog(onExport));
} else {
goToNextOpen();
}
Expand Down

0 comments on commit d6d8150

Please sign in to comment.