From 22e45ce2f917eb76fb3f5a28db1e3e9f2004f24d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janis=20Daniel=20Da=CC=88hne?=
<janis.daehne2@student.uni-halle.de>
Date: Wed, 5 Jun 2019 17:44:31 +0200
Subject: [PATCH] - some cleanup
---
src/communicationLayer/exerciseEditorLayer.ts | 6 +++---
.../openExercisesViaCodeSite.tsx | 2 ++
.../openExercisesViaVisibilitySite.tsx | 2 ++
.../changeTestDialog/changeTestView.tsx | 20 ++++++++-----------
.../dialogs/compareFilesTestSettingsView.tsx | 6 +-----
src/helpers/convertersAndTransformers.ts | 9 +++++----
.../changeCustomTestActions.ts | 13 ++++++------
.../customProjectTestActions.ts | 2 +-
.../changeTestDialog/changeTestActions.ts | 2 +-
.../customTestReducer.ts | 2 +-
.../changeTestDialog/editorTestReducer.ts | 4 ++--
src/types/customTests.ts | 2 +-
12 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/src/communicationLayer/exerciseEditorLayer.ts b/src/communicationLayer/exerciseEditorLayer.ts
index 95287718..a8eba71c 100644
--- a/src/communicationLayer/exerciseEditorLayer.ts
+++ b/src/communicationLayer/exerciseEditorLayer.ts
@@ -5,10 +5,10 @@
import * as genericLayer from './genericLayer'
import {
EditorExerciseForBackend,
- EditorExerciseFromBackend, FileWithData, ExerciseFromBackendWithData,
+ EditorExerciseFromBackend,
+ ExerciseFromBackendWithData,
FilePreviewFromBackend,
- TestAssetForBackend,
- TestAssetFromBackendWithData
+ FileWithData
} from "../types/exerciseEditor";
import {CancelToken} from 'axios'
diff --git a/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaCodeSite.tsx b/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaCodeSite.tsx
index 1cb3996f..3d6291b0 100644
--- a/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaCodeSite.tsx
+++ b/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaCodeSite.tsx
@@ -140,6 +140,8 @@ class OpenExercisesViaCodeSite extends React.Component<Props, any> {
const clientServerTimeDiffInS = moment().diff(serverTime, 'seconds')
+ clearInterval(updateLeftTimeIntervals)
+
updateLeftTimeIntervals = setInterval(() => {
const copy = updateExercisePreviews(this.props.openExercisePreviewsViaCode, clientServerTimeDiffInS, this.props.langId)
diff --git a/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaVisibilitySite.tsx b/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaVisibilitySite.tsx
index 15409a92..afc494a2 100644
--- a/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaVisibilitySite.tsx
+++ b/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaVisibilitySite.tsx
@@ -139,6 +139,8 @@ class OpenExercisesViaVisibilitySite extends React.Component<Props, any> {
const clientServerTimeDiffInS = moment().diff(serverTime, 'seconds')
+ clearInterval(updateLeftTimeIntervalsViaVisibility)
+
updateLeftTimeIntervalsViaVisibility = setInterval(() => {
const copy = updateExercisePreviews(this.props.openExercisePreviewsViaVisibility, clientServerTimeDiffInS, this.props.langId)
diff --git a/src/components/sites/editCustomProjectSite/dialogs/changeTestDialog/changeTestView.tsx b/src/components/sites/editCustomProjectSite/dialogs/changeTestDialog/changeTestView.tsx
index 255746c9..6b238945 100644
--- a/src/components/sites/editCustomProjectSite/dialogs/changeTestDialog/changeTestView.tsx
+++ b/src/components/sites/editCustomProjectSite/dialogs/changeTestDialog/changeTestView.tsx
@@ -17,20 +17,15 @@ import SimpleCodeEditorWrapper from '../../../../codeEditors/simpleCodeEditorWra
import ConsolePanelView from '../../../doExerciseSite/consolePanel/consolePanelView'
import {TestProtocolItem} from "../../../../../types/testResults";
import TestFilesListView from '../../../exerciseEditorSite/exerciseTestsPanel/dialogs/testFilesListView'
-import {
- CompareFileTestContentFrontendOnly,
- FilePreviewFromBackend,
- TestAssetForBackend
-} from "../../../../../types/exerciseEditor";
+import {CompareFileTestContentFrontendOnly} from "../../../../../types/exerciseEditor";
import {EditorTab} from "../../../../codeEditors/multiTabCodeEditorProps";
-import {InputOnChangeEvent, SelectOnChangeEventData} from "../../../../../types/reactEvents";
+import {SelectOnChangeEventData} from "../../../../../types/reactEvents";
import {convertTestProtocolFromString, parseId} from "../../../../../helpers/convertersAndTransformers";
-import {getNextFrontendId} from "../../../../../helpers/frontendIdHelper";
-import {readFileAsAsset} from "../../../../../helpers/fileReader";
import Logger from "../../../../../helpers/logger";
import {KnownInternalTestTypes} from "../../../../../types/testTypes";
import {
- checkRegexs, convertCompareTestToObj,
+ checkRegexs,
+ convertCompareTestToObj,
convertRegexTestObject,
parseRegexTestContent,
RegexTestObject,
@@ -45,7 +40,8 @@ import {
} from "../../../../../helpers/editorHelper";
import {errorDialog} from "../../../../../helpers/dialogHelper";
import {
- setDisplayNameAction, setEditorTest_compileTimeoutInMs,
+ setDisplayNameAction,
+ setEditorTest_compileTimeoutInMs,
setEditorTest_files,
setEditorTest_maxDiskSpaceInKb,
setEditorTest_memoryLimitInKb,
@@ -63,7 +59,8 @@ import CompareFilesTestSettingsView
import TestSettingsView from '../../../../helpers/tests/testSettingsView'
import ManageAssetFilesModal from '../../../exerciseEditorSite/addAssetFilesModal/addAssetFilesModal'
import {
- setAddCustomProjectCustomTestAssetFilesModalFilterText, setAddCustomProjectCustomTestAssetFilesModalUploadPercentage,
+ setAddCustomProjectCustomTestAssetFilesModalFilterText,
+ setAddCustomProjectCustomTestAssetFilesModalUploadPercentage,
setIsAddCustomProjectCustomTestAssetFilesModalDisplayed
} from '../../../../../state/actions/editCustomProjectSite/editCustomProjectActions'
import axios, {CancelTokenSource} from 'axios'
@@ -72,7 +69,6 @@ import {
detachFileFromCustomProjectCustomTestAsync
} from '../../../../../state/actions/editCustomProjectSite/editCustomProjectCrudActions'
import {getPossibleAllUserFilesAsync} from '../../../../../state/actions/doExerciseSite/doExerciseCrudActions'
-import {uploadCustomTestAssetFile} from '../../../../../communicationLayer/doExerciseLayer'
import {uploadCustomProjectCustomTestAssetFile} from '../../../../../communicationLayer/editCustomProjectLayer'
import {setCustomProjectTests} from '../../../../../state/actions/editCustomProjectSite/subSet/customProjectTestActions'
import {HelpPopup} from '../../../../helpers/helpPopup'
diff --git a/src/components/sites/exerciseEditorSite/exerciseTestsPanel/dialogs/compareFilesTestSettingsView.tsx b/src/components/sites/exerciseEditorSite/exerciseTestsPanel/dialogs/compareFilesTestSettingsView.tsx
index 56cb70a9..4d781dbc 100644
--- a/src/components/sites/exerciseEditorSite/exerciseTestsPanel/dialogs/compareFilesTestSettingsView.tsx
+++ b/src/components/sites/exerciseEditorSite/exerciseTestsPanel/dialogs/compareFilesTestSettingsView.tsx
@@ -2,11 +2,7 @@ import * as React from "react";
import {bindActionCreators, Dispatch} from "redux";
import {returntypeof} from 'react-redux-typescript';
import {RootState} from '../../../../../state/reducers'
-import {
- CompareFileTestContentFrontendOnly,
- FilePreviewFromBackend,
- TestAssetForBackend
-} from '../../../../../types/exerciseEditor'
+import {CompareFileTestContentFrontendOnly, FilePreviewFromBackend} from '../../../../../types/exerciseEditor'
import {connect} from 'react-redux'
import {getI18n} from '../../../../../../i18n/i18nRoot'
import {HelpPopup} from '../../../../helpers/helpPopup'
diff --git a/src/helpers/convertersAndTransformers.ts b/src/helpers/convertersAndTransformers.ts
index b20a0d7d..5ea0fe82 100644
--- a/src/helpers/convertersAndTransformers.ts
+++ b/src/helpers/convertersAndTransformers.ts
@@ -4,10 +4,11 @@
import {isNotNullOrUndefined} from "../validation/validations";
import {
EditorExerciseForBackend,
- EditorExerciseFromBackend, ExerciseFromBackendWithData,
- ExerciseTestFromBackend, ExerciseTestFromBackendWithData,
- RunnableExerciseTestFrontendExclusive,
- TestAssetForBackend, TestAssetFromBackendWithData
+ EditorExerciseFromBackend,
+ ExerciseFromBackendWithData,
+ ExerciseTestFromBackend,
+ ExerciseTestFromBackendWithData,
+ RunnableExerciseTestFrontendExclusive
} from "../types/exerciseEditor";
import {Moment} from "moment";
import {DoExerciseFromBackend, DoExerciseFrontendExclusive} from "../types/doExercise";
diff --git a/src/state/actions/doExerciseSite/dialogs/changeCustomTestDialog/changeCustomTestActions.ts b/src/state/actions/doExerciseSite/dialogs/changeCustomTestDialog/changeCustomTestActions.ts
index c631e303..1c2a0a02 100644
--- a/src/state/actions/doExerciseSite/dialogs/changeCustomTestDialog/changeCustomTestActions.ts
+++ b/src/state/actions/doExerciseSite/dialogs/changeCustomTestDialog/changeCustomTestActions.ts
@@ -7,18 +7,17 @@ import {
} from "../../../../reducers/doExerciseSite/dialogs/changeCustomTestDialog/changeCustomTestDialogReducer";
import {ActionType} from "../../../../reducers/doExerciseSite/dialogs/changeCustomTestDialog/changeCustomTestDialogActionTypes";
import {
- SET_contentAction, SET_displayIndexAction,
- SET_displayNameAction, SET_filesAction,
+ SET_contentAction,
+ SET_displayIndexAction,
+ SET_displayNameAction,
+ SET_filesAction,
SET_idAction,
SET_testTypeIdAction
} from "../../../../reducers/doExerciseSite/dialogs/changeCustomTestDialog/customTestReducer";
-import {FilePreviewFromBackend, TestAssetForBackend} from "../../../../../types/exerciseEditor";
+import {FilePreviewFromBackend} from "../../../../../types/exerciseEditor";
import {AwaitActions, MultiActions} from "../../../types";
import {setIsCustomTestDialogDisplayed} from "../../doExerciseSiteActions";
-import {
- CustomTestForBackend, CustomTestFromBackend,
- RunnableCustomTestFrontendExclusive
-} from "../../../../../types/customTests";
+import {CustomTestForBackend, RunnableCustomTestFrontendExclusive} from "../../../../../types/customTests";
import {createCustomTestDoEditor, updateCustomTestDoEditor} from "./customTestCrudActions";
import {setCustomTests} from "../../sub/customTestActions";
import {convertCustomTestFromBackendToRunnableFrontendCustomTest} from "../../../../../helpers/convertersAndTransformers";
diff --git a/src/state/actions/editCustomProjectSite/dialogs/changeCustomProjectTestDialog/customProjectTestActions.ts b/src/state/actions/editCustomProjectSite/dialogs/changeCustomProjectTestDialog/customProjectTestActions.ts
index 10845f42..360a96d6 100644
--- a/src/state/actions/editCustomProjectSite/dialogs/changeCustomProjectTestDialog/customProjectTestActions.ts
+++ b/src/state/actions/editCustomProjectSite/dialogs/changeCustomProjectTestDialog/customProjectTestActions.ts
@@ -15,7 +15,7 @@ import {
SET_testTypeIdAction,
SET_weightAction
} from "../../../../reducers/editCustomProjectSite/dialogs/changeCustomProjectTestDialog/customProjectTestReducer";
-import {FilePreviewFromBackend, TestAssetForBackend} from "../../../../../types/exerciseEditor";
+import {FilePreviewFromBackend} from "../../../../../types/exerciseEditor";
import {MultiActions} from "../../../types";
import {CustomProjectTestFullBase} from "../../../../../types/customProjects";
diff --git a/src/state/actions/exerciseEditorSite/dialogs/changeTestDialog/changeTestActions.ts b/src/state/actions/exerciseEditorSite/dialogs/changeTestDialog/changeTestActions.ts
index 09dc3706..dc366b5a 100644
--- a/src/state/actions/exerciseEditorSite/dialogs/changeTestDialog/changeTestActions.ts
+++ b/src/state/actions/exerciseEditorSite/dialogs/changeTestDialog/changeTestActions.ts
@@ -16,7 +16,7 @@ import {
SET_testTypeIdAction,
SET_weightAction
} from "../../../../reducers/exerciseEditorSite/dialogs/changeTestDialog/editorTestReducer";
-import {ExerciseTestForBackend, FilePreviewFromBackend, TestAssetForBackend} from "../../../../../types/exerciseEditor";
+import {ExerciseTestForBackend, FilePreviewFromBackend} from "../../../../../types/exerciseEditor";
import {MultiActions} from "../../../types";
diff --git a/src/state/reducers/doExerciseSite/dialogs/changeCustomTestDialog/customTestReducer.ts b/src/state/reducers/doExerciseSite/dialogs/changeCustomTestDialog/customTestReducer.ts
index 8778e25b..9870d778 100644
--- a/src/state/reducers/doExerciseSite/dialogs/changeCustomTestDialog/customTestReducer.ts
+++ b/src/state/reducers/doExerciseSite/dialogs/changeCustomTestDialog/customTestReducer.ts
@@ -5,7 +5,7 @@
import {CustomTestForBackend} from "../../../../../types/customTests";
import {getNextFrontendId} from "../../../../../helpers/frontendIdHelper";
import {ActionBase, ActionType} from "./changeCustomTestDialogActionTypes";
-import {FilePreviewFromBackend, TestAssetForBackend} from "../../../../../types/exerciseEditor";
+import {FilePreviewFromBackend} from "../../../../../types/exerciseEditor";
import {notExhaustive} from "../../../_notExhausiveHelper";
import {getValidationCollection, isNotEmptyOrSpaces} from "../../../../../validation/validations";
import {ActionTypeGlobal, RESET_GlobalAction} from '../../../globalActions'
diff --git a/src/state/reducers/exerciseEditorSite/dialogs/changeTestDialog/editorTestReducer.ts b/src/state/reducers/exerciseEditorSite/dialogs/changeTestDialog/editorTestReducer.ts
index 773c4595..c3a0835a 100644
--- a/src/state/reducers/exerciseEditorSite/dialogs/changeTestDialog/editorTestReducer.ts
+++ b/src/state/reducers/exerciseEditorSite/dialogs/changeTestDialog/editorTestReducer.ts
@@ -3,7 +3,7 @@
*/
import {notExhaustive} from "../../../_notExhausiveHelper";
-import {ExerciseTestForBackend, FilePreviewFromBackend, TestAssetForBackend} from "../../../../../types/exerciseEditor";
+import {ExerciseTestForBackend, FilePreviewFromBackend} from "../../../../../types/exerciseEditor";
import {ActionBase, ActionType} from "./changeTestDialogActionTypes";
import {getValidationCollection, isNotEmptyOrSpaces, isValidId} from "../../../../../validation/validations";
import {getNextFrontendId} from "../../../../../helpers/frontendIdHelper";
@@ -24,7 +24,7 @@ export const initial: () => State = () => {
displayIndex: -1, //use -1 and let determine the action the right index
isSubmitTest: false,
weight: 1,
- files: [], //TODO actions
+ files: [],
testTypeId: -1,
//TODO maybe validation??
testSettings: {
diff --git a/src/types/customTests.ts b/src/types/customTests.ts
index 68264e05..1b049c7c 100644
--- a/src/types/customTests.ts
+++ b/src/types/customTests.ts
@@ -3,7 +3,7 @@
*/
-import {FilePreviewFromBackend, TestAssetForBackend, TestAssetFromBackendWithData} from "./exerciseEditor";
+import {FilePreviewFromBackend} from "./exerciseEditor";
import {TestAnswerFromBackend} from "./testsAndTestProtocol";
--
GitLab