ref: changing question control wordings and some logic

Author: MmagdyHafezZ

apps/api-gateway/src/auth/jwt/cookie-based/mock.jwt.cookie.auth.guard.ts

@@ -23,7 +23,7 @@ export class MockJwtCookieAuthGuard extends AuthGuard("cookie-strategy") {
 
     request.user = {
       userId: "magdy.hafez@ibm.com",
-      role: UserRole.AUTHOR,
+      role: UserRole.LEARNER,
       groupId: "autogen-faculty-v1-course-v1-IND-AI0103EN-v1",
       assignmentId: 1,
       gradingCallbackRequired: false,

apps/api/src/api/assignment/attempt/attempt.service.ts

@@ -757,9 +757,11 @@ export class AttemptServiceV1 {
         showSubmissionFeedback: true,
         showQuestionScore: true,
         showQuestions: true,
+        questionControls: true,
         currentVersion: {
           select: {
             correctAnswerVisibility: true,
+            questionControls: true,
           },
         },
       },
@@ -2342,25 +2344,13 @@ export class AttemptServiceV1 {
     learnerResponse: string;
   } {
     const choices = this.parseChoices(question.choices);
-    console.log(
-      `Handling single correct question response for question ID: ${question.id}`,
-    );
     const learnerChoice =
       createQuestionResponseAttemptRequestDto.learnerChoices[0];
-    console.log(
-      `Learner choice: ${learnerChoice}, Choices: ${JSON.stringify(choices)}`,
-    );
     const normalizedLearnerChoice = this.normalizeText(learnerChoice);
     const correctChoice = choices.find((choice) => choice.isCorrect);
-    console.log(
-      `Correct choice: ${correctChoice ? correctChoice.choice : "None"}`,
-    );
     const selectedChoice = choices.find(
       (choice) => this.normalizeText(choice.choice) === normalizedLearnerChoice,
     );
-    console.log(
-      `Selected choice: ${selectedChoice ? selectedChoice.choice : "None"}`,
-    );
 
     const data = {
       learnerChoice,

apps/api/src/api/assignment/attempt/dto/assignment-attempt/get.assignment.attempt.response.dto.ts

@@ -113,6 +113,19 @@ export class GetAssignmentAttemptResponseDto extends AssignmentAttemptResponseDt
   })
   @Optional()
   comments?: string;
+
+  @ApiPropertyOptional({
+    description: "Question-level controls (copy, paste, right-click, print)",
+    type: "object",
+    required: false,
+  })
+  @Optional()
+  questionControls?: {
+    disableCopy?: boolean;
+    disablePaste?: boolean;
+    disableRightClick?: boolean;
+    disablePrint?: boolean;
+  };
 }
 
 export class AssignmentAttemptQuestions {

apps/api/src/api/assignment/dto/update.assignment.request.dto.ts

@@ -17,10 +17,10 @@ import {
 } from "class-validator";
 
 export interface QuestionControls {
-  allowCopy?: boolean;
-  allowPaste?: boolean;
-  allowRightClick?: boolean;
-  preventPrint?: boolean;
+  disableCopy?: boolean;
+  disablePaste?: boolean;
+  disableRightClick?: boolean;
+  disablePrint?: boolean;
   [key: string]: boolean | undefined;
 }
 

apps/api/src/api/assignment/dto/update.questions.request.dto.ts

@@ -578,6 +578,19 @@ export class UpdateAssignmentQuestionsDto {
   @IsOptional()
   correctAnswerVisibility: CorrectAnswerVisibility;
 
+  @ApiProperty({
+    description: "Question-level controls (copy, paste, right-click, print)",
+    required: false,
+    type: "object",
+  })
+  @IsOptional()
+  questionControls?: {
+    disableCopy?: boolean;
+    disablePaste?: boolean;
+    disableRightClick?: boolean;
+    disablePrint?: boolean;
+  };
+
   @ApiProperty({
     description: "updatedAt",
     required: false,

apps/api/src/api/assignment/v2/services/assignment.service.ts

@@ -231,6 +231,7 @@ export class AssignmentServiceV2 {
         timeEstimateMinutes: updateDto.timeEstimateMinutes,
         showQuestions: updateDto.showQuestions,
         numberOfQuestionsPerAttempt: updateDto.numberOfQuestionsPerAttempt,
+        questionControls: updateDto.questionControls,
       });
 
       await this.jobStatusService.updateJobStatus(jobId, {

apps/web/app/Helpers/checkDiff.ts

@@ -74,6 +74,7 @@ export function useChangesSummary(): string {
     strictTimeLimit,
     graded,
     numberOfQuestionsPerAttempt,
+    questionControls,
   } = useAssignmentConfig();
 
   const {
@@ -121,7 +122,8 @@ export function useChangesSummary(): string {
       !safeCompare(showAssignmentScore, originalAssignment.showAssignmentScore)
     )
       diffs.push("Changed assignment score visibility.");
-
+    if (!safeCompare(questionControls, originalAssignment.questionControls))
+      diffs.push("Modified question controls.");
     if (
       !safeCompare(
         correctAnswerVisibility,

apps/web/app/author/(components)/StepTwo/AssignmentQuestionControls.tsx

@@ -14,64 +14,47 @@ const AssignmentQuestionControls: FC<Props> = () => {
   );
 
   const handleToggle = (
-    key: "allowCopy" | "allowPaste" | "allowRightClick" | "preventPrint",
+    key: "disableCopy" | "disablePaste" | "disableRightClick" | "disablePrint",
   ) => {
     const newValue = !questionControls?.[key];
     const newControls = {
       ...questionControls,
       [key]: newValue,
     };
-
-    if (process.env.NODE_ENV === "development") {
-      console.log(`=== Toggle ${key} ===`);
-      console.log(`Old value:`, questionControls?.[key]);
-      console.log(`New value:`, newValue);
-      console.log(`Full questionControls:`, newControls);
-    }
-
     setQuestionControls(newControls);
   };
 
   return (
     <SectionWithTitle
-      title="Question Controls"
-      description="Configure what actions learners can perform while taking the assignment"
+      title="Assignment Restrictions"
+      description="Configure restrictions to prevent unauthorized behaviors during the assignment"
       className="flex flex-col gap-y-4"
     >
       <div className="flex flex-col gap-y-3">
         <ControlToggle
-          label="Allow Copying"
-          description="Let learners copy question text and their answers"
-          checked={questionControls?.allowCopy ?? false}
-          onChange={() => handleToggle("allowCopy")}
+          label="Disable Copying"
+          description="Prevent learners from copying question text or answers. Enable this to discourage sharing or plagiarism."
+          checked={questionControls?.disableCopy ?? false}
+          onChange={() => handleToggle("disableCopy")}
         />
         <ControlToggle
-          label="Allow Pasting"
-          description="Let learners paste content into answer fields"
-          checked={questionControls?.allowPaste ?? false}
-          onChange={() => handleToggle("allowPaste")}
+          label="Disable Pasting"
+          description="Prevent learners from pasting content into answer fields. Enable this to ensure original work or test typing skills."
+          checked={questionControls?.disablePaste ?? false}
+          onChange={() => handleToggle("disablePaste")}
         />
         <ControlToggle
-          label="Allow Right Click"
-          description="Let learners access the context menu with right click"
-          checked={questionControls?.allowRightClick ?? false}
-          onChange={() => handleToggle("allowRightClick")}
+          label="Disable Right Click"
+          description="Prevent learners from accessing the right-click context menu. Enable this to reduce copying or accessing browser features."
+          checked={questionControls?.disableRightClick ?? false}
+          onChange={() => handleToggle("disableRightClick")}
+        />
+        <ControlToggle
+          label="Disable Printing"
+          description="Block print attempts (Ctrl/Cmd+P) during the assignment. Enable this to prevent downloading or distributing the assignment."
+          checked={questionControls?.disablePrint ?? false}
+          onChange={() => handleToggle("disablePrint")}
         />
-      </div>
-
-      <div className="mt-2 pt-4 border-t border-gray-200">
-        <h3 className="text-sm font-semibold text-gray-900 mb-3">
-          Security Controls
-        </h3>
-        <div className="flex flex-col gap-y-3">
-          <ControlToggle
-            label="Prevent Printing"
-            description="Block print attempts (Ctrl/Cmd+P) during the assignment. Users can still screenshot, but they cannot download the assignment by printing it."
-            checked={questionControls?.preventPrint ?? false}
-            onChange={() => handleToggle("preventPrint")}
-            variant="prevent"
-          />
-        </div>
       </div>
     </SectionWithTitle>
   );
@@ -82,27 +65,16 @@ interface ControlToggleProps {
   description: string;
   checked: boolean;
   onChange: () => void;
-  variant?: "allow" | "prevent";
 }
 
 const ControlToggle: FC<ControlToggleProps> = ({
   label,
   description,
   checked,
   onChange,
-  variant = "allow",
 }) => {
-  const bgColor =
-    variant === "prevent"
-      ? checked
-        ? "bg-orange-600"
-        : "bg-gray-200"
-      : checked
-        ? "bg-violet-600"
-        : "bg-gray-200";
-
-  const ringColor =
-    variant === "prevent" ? "focus:ring-orange-600" : "focus:ring-violet-600";
+  const bgColor = checked ? "bg-orange-600" : "bg-gray-200";
+  const ringColor = "focus:ring-orange-600";
 
   return (
     <div className="flex items-start justify-between p-4 border border-gray-200 rounded-md hover:border-gray-300 transition-colors">