Rename and move isMinigame to assessment config in admin panel

Author: JustATin555

src/commons/application/actions/__tests__/SessionActions.ts

@@ -264,6 +264,7 @@ test('setAssessmentConfigurations generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -275,6 +276,7 @@ test('setAssessmentConfigurations generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -286,6 +288,7 @@ test('setAssessmentConfigurations generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,

src/commons/assessment/AssessmentTypes.ts

@@ -92,7 +92,7 @@ export type Assessment = {
   globalDeployment?: Library; // For mission control
   graderDeployment?: Library; // For mission control
   hasTokenCounter?: boolean;
-  onFinish?: string;
+  isMinigame?: boolean;
   id: number;
   longSummary: string;
   missionPDF: string;
@@ -106,6 +106,7 @@ export type AssessmentConfiguration = {
   isManuallyGraded: boolean;
   isGradingAutoPublished: boolean;
   displayInDashboard: boolean;
+  isMinigame: boolean;
   hoursBeforeEarlyXpDecay: number;
   earlySubmissionXp: number;
   hasTokenCounter: boolean;

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -602,6 +602,8 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
     };
   };
 
+  console.log(assessment);
+
   /**
    * controlBarProps() will only be called when assessment is not undefined
    * (see 'Rendering Logic' below), thus it is okay to use assessment!
@@ -700,7 +702,7 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
         }
         questionProgress={questionProgress}
         key="next_question"
-        submitOnFinish={assessment.onFinish === 'submitAndReturnToGame'}
+        submitOnFinish={assessment.isMinigame}
       />
     );
 

src/commons/assessmentWorkspace/__tests__/AssessmentWorkspace.tsx

@@ -21,6 +21,7 @@ const defaultProps = assertType<AssessmentWorkspaceProps>()({
     isManuallyGraded: true,
     isGradingAutoPublished: false,
     displayInDashboard: true,
+    isMinigame: false,
     hasTokenCounter: false,
     hasVotingFeatures: false,
     hoursBeforeEarlyXpDecay: 48,

src/commons/mocks/AssessmentMocks.ts

@@ -21,6 +21,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hoursBeforeEarlyXpDecay: 48,
       hasTokenCounter: false,
       hasVotingFeatures: false,
@@ -32,6 +33,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hoursBeforeEarlyXpDecay: 48,
       hasTokenCounter: false,
       hasVotingFeatures: false,
@@ -43,6 +45,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: false,
       isGradingAutoPublished: true,
       displayInDashboard: true,
+      isMinigame: false,
       hoursBeforeEarlyXpDecay: 48,
       hasTokenCounter: false,
       hasVotingFeatures: false,
@@ -54,6 +57,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hoursBeforeEarlyXpDecay: 48,
       hasTokenCounter: false,
       hasVotingFeatures: true,
@@ -65,6 +69,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hoursBeforeEarlyXpDecay: 48,
       hasTokenCounter: false,
       hasVotingFeatures: false,
@@ -78,6 +83,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hoursBeforeEarlyXpDecay: 48,
       hasTokenCounter: false,
       hasVotingFeatures: false,
@@ -89,6 +95,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hoursBeforeEarlyXpDecay: 48,
       hasTokenCounter: false,
       hasVotingFeatures: false,
@@ -100,6 +107,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hoursBeforeEarlyXpDecay: 48,
       hasTokenCounter: false,
       hasVotingFeatures: false,

src/commons/sagas/BackendSaga.ts

@@ -957,6 +957,7 @@ const newBackendSagaTwo = combineSagaHandlers(sagaActions, {
         isManuallyGraded: true,
         isGradingAutoPublished: false,
         displayInDashboard: true,
+        isMinigame: false,
         hoursBeforeEarlyXpDecay: 0,
         hasTokenCounter: false,
         hasVotingFeatures: false,

src/commons/sagas/__tests__/BackendSaga.ts

@@ -177,6 +177,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: true,
     isGradingAutoPublished: false,
     displayInDashboard: true,
+    isMinigame: false,
     hoursBeforeEarlyXpDecay: 48,
     hasTokenCounter: false,
     hasVotingFeatures: false,
@@ -188,6 +189,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: true,
     isGradingAutoPublished: false,
     displayInDashboard: true,
+    isMinigame: false,
     hoursBeforeEarlyXpDecay: 48,
     hasTokenCounter: false,
     hasVotingFeatures: false,
@@ -199,6 +201,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: false,
     isGradingAutoPublished: true,
     displayInDashboard: false,
+    isMinigame: false,
     hoursBeforeEarlyXpDecay: 48,
     hasTokenCounter: false,
     hasVotingFeatures: false,
@@ -210,6 +213,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: false,
     isGradingAutoPublished: false,
     displayInDashboard: false,
+    isMinigame: false,
     hoursBeforeEarlyXpDecay: 48,
     hasTokenCounter: false,
     hasVotingFeatures: true,
@@ -221,6 +225,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: true,
     isGradingAutoPublished: false,
     displayInDashboard: false,
+    isMinigame: false,
     hoursBeforeEarlyXpDecay: 48,
     hasTokenCounter: false,
     hasVotingFeatures: false,
@@ -1042,6 +1047,7 @@ describe('Test CREATE_COURSE action', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hoursBeforeEarlyXpDecay: 0,
       hasTokenCounter: false,
       hasVotingFeatures: false,

src/pages/academy/adminPanel/subcomponents/assessmentConfigPanel/AssessmentConfigPanel.tsx

@@ -31,6 +31,7 @@ const defaultAssessmentConfig: AssessmentConfiguration = {
   isManuallyGraded: true,
   isGradingAutoPublished: false,
   displayInDashboard: true,
+  isMinigame: false,
   hoursBeforeEarlyXpDecay: 0,
   hasTokenCounter: false,
   hasVotingFeatures: false,
@@ -131,6 +132,7 @@ const AssessmentConfigPanel: WithImperativeApi<
 
     /* eslint-disable react-hooks/exhaustive-deps */
     const setDisplayInDashboard = useCallback(valueSetter('displayInDashboard'), []);
+    const setIsMinigame = useCallback(valueSetter('isMinigame'), []);
     const setHasTokenCounter = useCallback(valueSetter('hasTokenCounter'), []);
     const setHasVotingFeatures = useCallback(valueSetter('hasVotingFeatures'), []);
     const setEarlyXp = useCallback(valueSetter('earlySubmissionXp'), []);
@@ -201,6 +203,15 @@ const AssessmentConfigPanel: WithImperativeApi<
             field: 'displayInDashboard'
           }
         },
+        {
+          headerName: 'Is Minigame',
+          field: 'isMinigame',
+          cellRenderer: BooleanCell,
+          cellRendererParams: {
+            setStateHandler: setIsMinigame,
+            field: 'isMinigame'
+          }
+        },
         {
           headerName: 'Voting Features*',
           field: 'hasVotingFeatures',