diff --git a/src/communicationLayer/exerciseEditorLayer.ts b/src/communicationLayer/exerciseEditorLayer.ts index 952877187cf3c7471b21bec419b3a8e15c7438d7..a8eba71c778e6a6565710289b065ea55529f5503 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 1cb3996fbb79d9e62f98a9c0307fd6a8406030f9..3d6291b092fc141663cf053854cff04cdda72374 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 15409a92048020afbe825eef17bf422de5afcdb1..afc494a241d2c8a53426bcdc0758e4b60db1e2f0 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 255746c96acab102a053f477cc07f86531a278ac..6b238945f8fce36fa580e0dcb8f4b0be039f5c33 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 56cb70a94fed3a276b286ee6e077b91863fef0b9..4d781dbcbfafa2cb578a7fe288d3671a67cd60c4 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 b20a0d7db871f8481500abafa6a488e53a3ccf7e..5ea0fe82a852fe1d2845f3121df899fbcd669b6e 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 c631e303b07aadbd63ebc039a752d884b231ca55..1c2a0a02d102af41f65749d566e3b139a9360383 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 10845f42594671a56ad2ced87d063d18aca4be02..360a96d6c48c43b9949a77a8cb24ff4279273538 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 09dc370603209e6e37d31119b23ca5f62ad0f5c0..dc366b5af8911ad00715a5f69d9209bc513aa9ba 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 8778e25b6fbff956ebd3748606b7082f17e5ffc3..9870d7789e22cfd1f1acf6c62181d078c8b273dc 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 773c4595ab217f3cac76340ecd018931458af760..c3a0835acf7b2670308e843e747f1cd25acd478d 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 68264e0537d4cd8b3583f34c94f0d322255fbcef..1b049c7c90fbc22405c421517a67af9bda94e516 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";