@doenet/assignment-viewer 0.1.0-alpha5 → 0.1.0-alpha6

package/dist/index.js

@@ -1686,7 +1686,6 @@ function generateNewSingleDocAttempt({
   state,
   numActivityVariants,
   initialQuestionCounter,
-  questionCounts,
   parentAttempt
 }) {
   const previousVariants = state.previousVariants;
@@ -1706,7 +1705,7 @@ function generateNewSingleDocAttempt({
   if (state.restrictToVariantSlice) {
     selectedVariant = (selectedVariant - 1) * state.restrictToVariantSlice.numSlices + state.restrictToVariantSlice.idx;
   }
-  const finalQuestionCounter = initialQuestionCounter + questionCounts[state.source.id];
+  const finalQuestionCounter = initialQuestionCounter + (state.source.isDescription ? 0 : 1);
   const newState = {
     ...state,
     creditAchieved: 0,
@@ -1836,7 +1835,6 @@ function generateNewSelectAttempt({
   state,
   numActivityVariants,
   initialQuestionCounter,
-  questionCounts,
   parentAttempt
 }) {
   const source = state.source;
@@ -1928,7 +1926,6 @@ function generateNewSelectAttempt({
       state: newActivityOptionStates[childIdx],
       numActivityVariants,
       initialQuestionCounter: questionCounter,
-      questionCounts,
       parentAttempt: state.attemptNumber + 1
     });
     questionCounter = endCounter;
@@ -1953,7 +1950,6 @@ function generateNewSingleDocAttemptForMultiSelect({
   state,
   numActivityVariants,
   initialQuestionCounter,
-  questionCounts,
   parentAttempt,
   childId
 }) {
@@ -2002,7 +1998,6 @@ function generateNewSingleDocAttemptForMultiSelect({
     state: newActivityOptionStates[selectedIdx],
     numActivityVariants,
     initialQuestionCounter,
-    questionCounts,
     parentAttempt: state.attemptNumber + 1
   });
   newActivityOptionStates[selectedIdx] = newChildState;
@@ -2171,7 +2166,6 @@ function generateNewSequenceAttempt({
   state,
   numActivityVariants,
   initialQuestionCounter,
-  questionCounts,
   parentAttempt
 }) {
   var _a;
@@ -2219,7 +2213,6 @@ function generateNewSequenceAttempt({
       state: originalState,
       numActivityVariants,
       initialQuestionCounter: questionCounter,
-      questionCounts,
       parentAttempt: state.attemptNumber + 1
     });
     questionCounter = endCounter;
@@ -3191,7 +3184,6 @@ function generateNewActivityAttempt({
   state,
   numActivityVariants,
   initialQuestionCounter,
-  questionCounts,
   parentAttempt
 }) {
   switch (state.type) {
@@ -3200,7 +3192,6 @@ function generateNewActivityAttempt({
         state,
         numActivityVariants,
         initialQuestionCounter,
-        questionCounts,
         parentAttempt
       });
     }
@@ -3209,7 +3200,6 @@ function generateNewActivityAttempt({
         state,
         numActivityVariants,
         initialQuestionCounter,
-        questionCounts,
         parentAttempt
       });
     }
@@ -3218,7 +3208,6 @@ function generateNewActivityAttempt({
         state,
         numActivityVariants,
         initialQuestionCounter,
-        questionCounts,
         parentAttempt
       });
     }
@@ -3229,8 +3218,7 @@ function generateNewSingleDocSubAttempt({
   singleDocId,
   state,
   numActivityVariants,
-  initialQuestionCounter,
-  questionCounts
+  initialQuestionCounter
 }) {
   if (singleDocId === state.id) {
     throw Error(
@@ -3256,7 +3244,6 @@ function generateNewSingleDocSubAttempt({
         state: parentState,
         numActivityVariants,
         initialQuestionCounter,
-        questionCounts,
         parentAttempt: grandParentAttempt,
         childId: singleDocId
       }));
@@ -3265,7 +3252,6 @@ function generateNewSingleDocSubAttempt({
         state: parentState,
         numActivityVariants,
         initialQuestionCounter,
-        questionCounts,
         parentAttempt: grandParentAttempt
       }));
     }
@@ -3279,7 +3265,6 @@ function generateNewSingleDocSubAttempt({
       state: allStates[singleDocId],
       numActivityVariants,
       initialQuestionCounter,
-      questionCounts,
       parentAttempt: parentState.attemptNumber
     });
     allStates[singleDocId] = newSubActivityState;
@@ -3429,27 +3414,22 @@ function validateIds(source) {
 function gatherDocumentStructure(source) {
   if (source.type === "singleDoc") {
     return {
-      numActivityVariants: { [source.id]: source.numVariants ?? 1 },
-      questionCounts: {
-        [source.id]: source.baseComponentCounts ? (source.baseComponentCounts.question ?? 0) + (source.baseComponentCounts.problem ?? 0) + (source.baseComponentCounts.exercise ?? 0) : 1
-      }
+      numActivityVariants: { [source.id]: source.numVariants ?? 1 }
     };
   } else {
     const numActivityVariants = {};
-    const questionCounts = {};
     for (const item of source.items) {
       const res = gatherDocumentStructure(item);
       Object.assign(numActivityVariants, res.numActivityVariants);
-      Object.assign(questionCounts, res.questionCounts);
     }
-    return { numActivityVariants, questionCounts };
+    return { numActivityVariants };
   }
 }
 function validateStateAndSource(state, source) {
   if (!isExportedActivityState(state) || !isActivitySource(source)) {
     return false;
   }
-  const sourceHash = hash(source);
+  const sourceHash = createSourceHash(source);
   return state.sourceHash === sourceHash;
 }
 function gatherStates(state) {
@@ -3523,6 +3503,22 @@ function propagateStateChangeToRoot({
     id: newParentState.id
   });
 }
+function removeVersionFromSource(source) {
+  if (source.type === "singleDoc") {
+    return {
+      ...source,
+      version: ""
+    };
+  } else {
+    return {
+      ...source,
+      items: source.items.map(removeVersionFromSource)
+    };
+  }
+}
+function createSourceHash(source) {
+  return hash(removeVersionFromSource(source));
+}
 function isSingleDocReportStateMessage(obj) {
   const typeObj = obj;
   return (
@@ -3702,7 +3698,8 @@ function SelectActivity({
   reportVisibility = false,
   reportVisibilityCallback,
   itemAttemptNumbers,
-  itemSequence
+  itemSequence,
+  itemWord
 }) {
   const selectedActivities = [];
   const selectedIds = [];
@@ -3733,7 +3730,8 @@ function SelectActivity({
           reportVisibility,
           reportVisibilityCallback,
           itemAttemptNumbers,
-          itemSequence
+          itemSequence,
+          itemWord
         },
         activity.id
       )
@@ -3765,7 +3763,8 @@ function SequenceActivity({
   reportVisibility = false,
   reportVisibilityCallback,
   itemAttemptNumbers,
-  itemSequence
+  itemSequence,
+  itemWord
 }) {
   const activityList = [];
   for (const activity of state.orderedChildren) {
@@ -3795,7 +3794,8 @@ function SequenceActivity({
           reportVisibility,
           reportVisibilityCallback,
           itemAttemptNumbers,
-          itemSequence
+          itemSequence,
+          itemWord
         },
         activity.id
       )
@@ -53268,7 +53268,7 @@ function ExternalVirtualKeyboard() {
     }
   );
 }
-const version = "0.7.0-alpha32";
+const version = "0.7.0-alpha33";
 const latestDoenetmlVersion = version;
 function DoenetViewer({
   doenetML,
@@ -53430,7 +53430,8 @@ function SingleDocActivity({
   reportVisibility = false,
   reportVisibilityCallback,
   itemAttemptNumbers,
-  itemSequence
+  itemSequence,
+  itemWord
 }) {
   const [rendered, setRendered] = useState$3(false);
   const [attemptNumber, setAttemptNumber] = useState$3(state.attemptNumber);
@@ -53476,6 +53477,8 @@ function SingleDocActivity({
   const showAttemptButton = allowItemAttemptButtons && generateNewItemAttempt !== void 0 && !source.isDescription && maxAttemptsAllowed !== 1;
   const render3 = checkRender(state);
   const hidden = checkHidden(state);
+  const newAttemptsLeft = Math.max(maxAttemptsAllowed - itemAttemptNumber, 0);
+  const attemptButtonDisabled = maxAttemptsAllowed > 0 && newAttemptsLeft <= 0;
   return /* @__PURE__ */ jsxRuntimeExports$1.jsx("div", { ref, children: /* @__PURE__ */ jsxRuntimeExports$1.jsxs("div", { hidden: !render3 || hidden, style: { minHeight: "100px" }, children: [
     /* @__PURE__ */ jsxRuntimeExports$1.jsx(
       DoenetViewer,
@@ -53517,17 +53520,21 @@ function SingleDocActivity({
             state.initialQuestionCounter
           );
         },
-        disabled: maxAttemptsAllowed > 0 && itemAttemptNumber >= maxAttemptsAllowed,
+        disabled: attemptButtonDisabled,
         style: {
           marginLeft: "20px",
-          backgroundColor: "lightgray",
+          backgroundColor: "rgb(237, 242, 247)",
+          opacity: attemptButtonDisabled ? 0.4 : "inherit",
           borderRadius: "10px",
-          padding: "5px 20px"
+          padding: "5px 20px",
+          cursor: attemptButtonDisabled ? "not-allowed" : "pointer"
         },
         children: [
-          "New item attempt",
+          "New ",
+          itemWord,
+          " attempt",
           " ",
-          maxAttemptsAllowed > 0 ? `(${(maxAttemptsAllowed - itemAttemptNumber).toString()} left)` : null
+          maxAttemptsAllowed > 0 ? `(${newAttemptsLeft.toString()} left)` : null
         ]
       }
     ) : null
@@ -53556,7 +53563,8 @@ function Activity({
   reportVisibility = false,
   reportVisibilityCallback,
   itemAttemptNumbers,
-  itemSequence
+  itemSequence,
+  itemWord
 }) {
   switch (state.type) {
     case "singleDoc": {
@@ -53585,7 +53593,8 @@ function Activity({
           reportVisibility,
           reportVisibilityCallback,
           itemAttemptNumbers,
-          itemSequence
+          itemSequence,
+          itemWord
         }
       );
     }
@@ -53615,7 +53624,8 @@ function Activity({
           reportVisibility,
           reportVisibilityCallback,
           itemAttemptNumbers,
-          itemSequence
+          itemSequence,
+          itemWord
         }
       );
     }
@@ -53645,7 +53655,8 @@ function Activity({
           reportVisibility,
           reportVisibilityCallback,
           itemAttemptNumbers,
-          itemSequence
+          itemSequence,
+          itemWord
         }
       );
     }
@@ -53687,7 +53698,6 @@ function activityDoenetStateReducer(state, action) {
         state: activityState,
         numActivityVariants: action.numActivityVariants,
         initialQuestionCounter: action.initialQuestionCounter,
-        questionCounts: action.questionCounts,
         parentAttempt: 1
       });
       const newItemAttemptNumbers = state.itemAttemptNumbers.map(() => 1);
@@ -53724,8 +53734,7 @@ function activityDoenetStateReducer(state, action) {
         singleDocId: action.docId,
         state: activityState,
         numActivityVariants: action.numActivityVariants,
-        initialQuestionCounter: action.initialQuestionCounter,
-        questionCounts: action.questionCounts
+        initialQuestionCounter: action.initialQuestionCounter
       });
       const newDoenetMLStates = [...state.doenetStates];
       newDoenetMLStates[action.doenetStateIdx] = null;
@@ -53833,15 +53842,16 @@ function Viewer({
   darkMode = "light",
   showAnswerResponseMenu = false,
   answerResponseCountsByItem = [],
-  showTitle = true
+  showTitle = true,
+  itemWord = "item"
 }) {
   const [errMsg, setErrMsg] = useState$3(null);
   const initialPass = useRef$6(true);
-  const { numActivityVariants, questionCounts, sourceHash, numItems } = useMemo$4(() => {
+  const { numActivityVariants, sourceHash, numItems } = useMemo$4(() => {
     try {
       validateIds(source);
       const docStructure = gatherDocumentStructure(source);
-      const sourceHash2 = hash(source);
+      const sourceHash2 = createSourceHash(source);
       const numItems2 = getNumItems(source);
       return { ...docStructure, sourceHash: sourceHash2, numItems: numItems2 };
     } catch (e2) {
@@ -53849,7 +53859,6 @@ function Viewer({
       setErrMsg(`Error in activity source: ${message}`);
       return {
         numActivityVariants: {},
-        questionCounts: {},
         sourceHash: "",
         numItems: 0
       };
@@ -53872,6 +53881,9 @@ function Viewer({
   const [itemsRendered, setItemsRendered] = useState$3([]);
   const [itemsToRender, setItemsToRender] = useState$3([]);
   const [itemsVisible, setItemsVisible] = useState$3([]);
+  const [newAttemptNum, setNewAttemptNum] = useState$3(0);
+  const dialogRef = useRef$6(null);
+  const newItemAttemptInfo = useRef$6({ id: "", initialQuestionCounter: 0 });
   const attemptNumber = activityState.attemptNumber;
   function addItemToRender(id2) {
     if (!itemsToRender.includes(id2)) {
@@ -53997,7 +54009,6 @@ function Viewer({
           type: "generateNewActivityAttempt",
           numActivityVariants,
           initialQuestionCounter: 1,
-          questionCounts,
           allowSaveState: flags.allowSaveState,
           baseId: activityId,
           sourceHash
@@ -54044,7 +54055,6 @@ function Viewer({
     userId,
     source,
     numActivityVariants,
-    questionCounts,
     sourceHash
   ]);
   function clickNext() {
@@ -54068,7 +54078,14 @@ function Viewer({
       });
     }
   }
-  function generateNewItemAttempt(id2, initialQuestionCounter) {
+  function generateNewItemAttemptPrompt(id2, initialQuestionCounter) {
+    var _a;
+    newItemAttemptInfo.current = { id: id2, initialQuestionCounter };
+    setNewAttemptNum((itemSequence.indexOf(id2) ?? 0) + 1);
+    (_a = dialogRef.current) == null ? void 0 : _a.showModal();
+  }
+  function generateNewItemAttempt() {
+    const { id: id2, initialQuestionCounter } = newItemAttemptInfo.current;
     activityDoenetStateDispatch({
       type: "generateSingleDocSubActivityAttempt",
       docId: id2,
@@ -54076,7 +54093,6 @@ function Viewer({
       itemSequence,
       numActivityVariants,
       initialQuestionCounter,
-      questionCounts,
       allowSaveState: flags.allowSaveState,
       baseId: activityId,
       sourceHash
@@ -54135,17 +54151,17 @@ function Viewer({
     });
   }
   function generateActivityAttempt() {
+    setItemsRendered([]);
+    setItemsToRender([]);
+    setCurrentItemIdx(0);
     activityDoenetStateDispatch({
       type: "generateNewActivityAttempt",
       numActivityVariants,
       initialQuestionCounter: 1,
-      questionCounts,
       allowSaveState: flags.allowSaveState,
       baseId: activityId,
       sourceHash
     });
-    setItemsRendered([]);
-    setCurrentItemIdx(0);
   }
   if (errMsg !== null) {
     const errorIcon = /* @__PURE__ */ jsxRuntimeExports$1.jsx("span", { style: { fontSize: "1em", color: "#C1292E" }, children: /* @__PURE__ */ jsxRuntimeExports$1.jsx(MdError, {}) });
@@ -54187,7 +54203,77 @@ function Viewer({
       }
     }
   }
+  const activityAttemptsLeft = Math.max(
+    maxAttemptsAllowed - attemptNumber,
+    0
+  );
+  const newAttemptsLeft = newAttemptNum === 0 ? activityAttemptsLeft : Math.max(
+    maxAttemptsAllowed - activityDoenetState.itemAttemptNumbers[newAttemptNum - 1],
+    0
+  );
+  const newAttemptDisabled = numItems === 0 || maxAttemptsAllowed > 0 && activityAttemptsLeft <= 0;
   return /* @__PURE__ */ jsxRuntimeExports$1.jsxs("div", { children: [
+    /* @__PURE__ */ jsxRuntimeExports$1.jsxs("dialog", { ref: dialogRef, children: [
+      /* @__PURE__ */ jsxRuntimeExports$1.jsxs("h3", { children: [
+        "Create new attempt of",
+        " ",
+        newAttemptNum === 0 ? "the entire activity" : `${itemWord} ${newAttemptNum.toString()}`,
+        "?"
+      ] }),
+      /* @__PURE__ */ jsxRuntimeExports$1.jsxs("p", { children: [
+        "Creating a new attempt will generate",
+        " ",
+        newAttemptNum === 0 ? `new versions of all ${itemWord}s so that you can start again at the beginning.` : `a new version of ${itemWord} ${newAttemptNum.toString()} so that you can start that ${itemWord} again.`
+      ] }),
+      maxAttemptsAllowed > 0 ? /* @__PURE__ */ jsxRuntimeExports$1.jsxs("p", { children: [
+        "You can create a new attempt",
+        " ",
+        newAttemptsLeft.toString(),
+        " more time",
+        newAttemptsLeft > 1 ? "s" : "",
+        "."
+      ] }) : null,
+      /* @__PURE__ */ jsxRuntimeExports$1.jsxs("p", { style: { marginTop: "30px" }, children: [
+        /* @__PURE__ */ jsxRuntimeExports$1.jsx(
+          "button",
+          {
+            autoFocus: true,
+            onClick: () => {
+              var _a;
+              (_a = dialogRef.current) == null ? void 0 : _a.close();
+            },
+            style: {
+              marginLeft: "30px",
+              backgroundColor: "lightgray",
+              borderRadius: "10px",
+              padding: "5px 20px"
+            },
+            children: "Cancel"
+          }
+        ),
+        /* @__PURE__ */ jsxRuntimeExports$1.jsx(
+          "button",
+          {
+            onClick: () => {
+              var _a;
+              if (newAttemptNum === 0) {
+                generateActivityAttempt();
+              } else {
+                generateNewItemAttempt();
+              }
+              (_a = dialogRef.current) == null ? void 0 : _a.close();
+            },
+            style: {
+              marginLeft: "30px",
+              backgroundColor: "lightgray",
+              borderRadius: "10px",
+              padding: "5px 20px"
+            },
+            children: "Create new attempt"
+          }
+        )
+      ] })
+    ] }),
     showTitle ? /* @__PURE__ */ jsxRuntimeExports$1.jsx("h2", { style: { marginLeft: "20px" }, children: source.title }) : null,
     /* @__PURE__ */ jsxRuntimeExports$1.jsx("div", { style: { marginTop: "5px" }, children: /* @__PURE__ */ jsxRuntimeExports$1.jsxs("div", { children: [
       /* @__PURE__ */ jsxRuntimeExports$1.jsxs("span", { hidden: !paginate, children: [
@@ -54228,18 +54314,24 @@ function Viewer({
       activityLevelAttempts && maxAttemptsAllowed !== 1 ? /* @__PURE__ */ jsxRuntimeExports$1.jsxs(
         "button",
         {
-          onClick: generateActivityAttempt,
-          disabled: numItems === 0 || maxAttemptsAllowed > 0 && attemptNumber >= maxAttemptsAllowed,
+          onClick: () => {
+            var _a;
+            setNewAttemptNum(0);
+            (_a = dialogRef.current) == null ? void 0 : _a.showModal();
+          },
+          disabled: newAttemptDisabled,
           style: {
             marginLeft: "30px",
-            backgroundColor: "lightgray",
+            backgroundColor: "rgb(237, 242, 247)",
+            opacity: newAttemptDisabled ? 0.4 : "inherit",
             borderRadius: "10px",
-            padding: "5px 20px"
+            padding: "5px 20px",
+            cursor: newAttemptDisabled ? "not-allowed" : "pointer"
           },
           children: [
             "New attempt",
             " ",
-            maxAttemptsAllowed > 0 ? `(${(maxAttemptsAllowed - attemptNumber).toString()} left)` : null
+            maxAttemptsAllowed > 0 ? `(${activityAttemptsLeft.toString()} left)` : null
           ]
         }
       ) : null
@@ -54272,12 +54364,13 @@ function Viewer({
         checkRender,
         checkHidden,
         allowItemAttemptButtons: itemLevelAttempts,
-        generateNewItemAttempt,
+        generateNewItemAttempt: generateNewItemAttemptPrompt,
         hasRenderedCallback,
         reportVisibility: !paginate,
         reportVisibilityCallback,
         itemAttemptNumbers: activityDoenetState.itemAttemptNumbers,
-        itemSequence
+        itemSequence,
+        itemWord
       }
     )
   ] });
@@ -54318,7 +54411,8 @@ function ActivityViewer({
   showAnswerResponseMenu = false,
   answerResponseCountsByItem = [],
   includeVariantSelector: _includeVariantSelector = false,
-  showTitle = true
+  showTitle = true,
+  itemWord = "item"
 }) {
   const [initialVariantIndex, setInitialVariantIndex] = useState$3(null);
   const thisPropSet = {
@@ -54372,7 +54466,8 @@ function ActivityViewer({
       darkMode,
       showAnswerResponseMenu,
       answerResponseCountsByItem,
-      showTitle
+      showTitle,
+      itemWord
     }
   ) });
 }

package/package.json

@@ -2,7 +2,7 @@
     "name": "@doenet/assignment-viewer",
     "private": false,
     "description": "View assignments from questions written in DoenetML",
-    "version": "0.1.0-alpha5",
+    "version": "0.1.0-alpha6",
     "license": "AGPL-3.0-or-later",
     "homepage": "https://github.com/Doenet/assignment-viewer#readme",
     "type": "module",
@@ -34,7 +34,7 @@
         "react-dom": "^18.3.1"
     },
     "dependencies": {
-        "@doenet/doenetml-iframe": "^0.7.0-alpha32",
+        "@doenet/doenetml-iframe": "^0.7.0-alpha33",
         "nanoid": "^5.0.9",
         "object-hash": "^3.0.0",
         "react-icons": "^5.4.0",