@speakableio/core 0.1.17 → 0.1.19

package/dist/index.js

@@ -1371,6 +1371,7 @@ var getScore = withErrorHandler(_getScore, "getScore");
 
 // src/domains/assignment/utils/calculateScoreAndProgress.ts
 var calculateScoreAndProgress = (scores, cardsList, weights) => {
+  console.log("calculateScoreAndProgress", scores, cardsList, weights);
   const totalSetPoints = cardsList.reduce((acc, cardId) => {
     acc += _optionalChain([weights, 'optionalAccess', _32 => _32[cardId]]) || 1;
     return acc;
@@ -1481,7 +1482,7 @@ async function clearScore(params) {
 
 // src/domains/assignment/services/submit-assignment-score.service.ts
 
-async function submitAssignmentScore({
+async function _submitAssignmentScore({
   cardIds,
   assignment,
   setWeights,
@@ -1513,6 +1514,10 @@ async function submitAssignmentScore({
   await api.updateDoc(path, { ...fieldsUpdated });
   return { success: true, fieldsUpdated };
 }
+var submitAssignmentScore = withErrorHandler(
+  _submitAssignmentScore,
+  "submitAssignmentScore"
+);
 async function handleAssessment(assignment, userId, cardIds, setWeights, fieldsUpdated, studentName) {
   const path = refsAssignmentFiresotre.assignmentScores({ id: assignment.id, userId });
   const response = await api.getDoc(path);
@@ -1532,7 +1537,7 @@ async function handleAssessment(assignment, userId, cardIds, setWeights, fieldsU
   return { success: true, fieldsUpdated };
 }
 async function handleCourseAssignment(assignment, userId) {
-  const { data } = await _optionalChain([SpeakableFirebaseFunctions, 'optionalAccess', _51 => _51.submitAssignmentV2, 'optionalCall', _52 => _52({
+  await _optionalChain([SpeakableFirebaseFunctions, 'optionalAccess', _51 => _51.submitAssignmentV2, 'optionalCall', _52 => _52({
     assignmentId: assignment.id,
     userId
   })]);
@@ -1622,11 +1627,11 @@ function useUpdateCardScore({
   const mutation = _reactquery.useMutation.call(void 0, {
     mutationFn: async ({ cardId, cardScore }) => {
       const previousScores = queryClient.getQueryData(queryKey);
-      console.log({
-        previousScores,
+      console.log("useUpdateCardScore", {
+        previousScores: _nullishCoalesce(previousScores, () => ( {})),
         cardId,
         cardScore,
-        dataCurrentSet
+        activityId
       });
       const { progress, score, newScoreUpdated, updatedCardScore } = getScoreUpdated({
         previousScores: _nullishCoalesce(previousScores, () => ( {})),
@@ -1879,11 +1884,12 @@ function useActivity({
     enabled: isAssignment
   });
   const activeAssignment = assignmentQuery.data;
-  const activityId = isAssignment ? _nullishCoalesce(_optionalChain([activeAssignment, 'optionalAccess', _62 => _62.id]), () => ( "")) : id;
-  const querySet = useSet({ setId: _nullishCoalesce(id, () => ( "")), enabled: isAssignment });
+  const setId = isAssignment ? _nullishCoalesce(_optionalChain([activeAssignment, 'optionalAccess', _62 => _62.setId]), () => ( "")) : id;
+  const querySet = useSet({ setId });
   const setData = querySet.data;
+  const activityId = isAssignment ? _nullishCoalesce(_optionalChain([activeAssignment, 'optionalAccess', _63 => _63.id]), () => ( "")) : setId;
   const { cardsObject, cardsQueries, cards } = useCards({
-    cardIds: _nullishCoalesce(_optionalChain([setData, 'optionalAccess', _63 => _63.content]), () => ( [])),
+    cardIds: _nullishCoalesce(_optionalChain([setData, 'optionalAccess', _64 => _64.content]), () => ( [])),
     enabled: querySet.isSuccess,
     asObject: true
   });
@@ -1891,7 +1897,7 @@ function useActivity({
     isAssignment,
     activityId: id,
     userId,
-    courseId: _optionalChain([activeAssignment, 'optionalAccess', _64 => _64.courseId]),
+    courseId: _optionalChain([activeAssignment, 'optionalAccess', _65 => _65.courseId]),
     googleClassroomUserId: user.profile.googleClassroomUserId,
     enabled: isAssignment ? assignmentQuery.isSuccess : querySet.isSuccess
   });
@@ -1922,12 +1928,12 @@ function useActivity({
     cardId,
     wasCompleted = true
   }) => {
-    const currentCard = _optionalChain([cardsObject, 'optionalAccess', _65 => _65[cardId]]);
-    if (_optionalChain([currentCard, 'optionalAccess', _66 => _66.type]) === "MULTIPLE_CHOICE" /* MULTIPLE_CHOICE */ || _optionalChain([currentCard, 'optionalAccess', _67 => _67.type]) === "READ_REPEAT" /* READ_REPEAT */) {
+    const currentCard = _optionalChain([cardsObject, 'optionalAccess', _66 => _66[cardId]]);
+    if (_optionalChain([currentCard, 'optionalAccess', _67 => _67.type]) === "MULTIPLE_CHOICE" /* MULTIPLE_CHOICE */ || _optionalChain([currentCard, 'optionalAccess', _68 => _68.type]) === "READ_REPEAT" /* READ_REPEAT */) {
       return;
     }
     const queryKeys = scoreQueryKeys.byId(activityId);
-    const activeCardScores = _optionalChain([queryClient, 'access', _68 => _68.getQueryData, 'call', _69 => _69(queryKeys), 'optionalAccess', _70 => _70.cards, 'optionalAccess', _71 => _71[cardId]]);
+    const activeCardScores = _optionalChain([queryClient, 'access', _69 => _69.getQueryData, 'call', _70 => _70(queryKeys), 'optionalAccess', _71 => _71.cards, 'optionalAccess', _72 => _72[cardId]]);
     if (activeCardScores === void 0) return;
     mutationClearScore.mutate({
       isAssignment,
@@ -1941,21 +1947,21 @@ function useActivity({
     try {
       let results;
       if (isAssignment) {
-        const cardScores = _optionalChain([scoreQuery, 'access', _72 => _72.data, 'optionalAccess', _73 => _73.cards]) || {};
+        const cardScores = _optionalChain([scoreQuery, 'access', _73 => _73.data, 'optionalAccess', _74 => _74.cards]) || {};
         const hasPendingReview = Object.values(cardScores).some(
           (cardScore) => cardScore.status === "pending_review"
         );
         results = await submitAssignmentScore2({
           assignment: assignmentQuery.data,
           userId,
-          cardIds: _nullishCoalesce(_optionalChain([setData, 'optionalAccess', _74 => _74.content]), () => ( [])),
+          cardIds: _nullishCoalesce(_optionalChain([setData, 'optionalAccess', _75 => _75.content]), () => ( [])),
           scores: scoreQuery.data,
-          setWeights: _nullishCoalesce(_optionalChain([setData, 'optionalAccess', _75 => _75.weights]), () => ( {})),
+          setWeights: _nullishCoalesce(_optionalChain([setData, 'optionalAccess', _76 => _76.weights]), () => ( {})),
           status: hasPendingReview ? "PENDING_REVIEW" : "FINALIZED"
         });
       } else {
         results = await submitPracticeScore2({
-          setId: _nullishCoalesce(_optionalChain([querySet, 'access', _76 => _76.data, 'optionalAccess', _77 => _77.id]), () => ( "")),
+          setId: _nullishCoalesce(_optionalChain([querySet, 'access', _77 => _77.data, 'optionalAccess', _78 => _78.id]), () => ( "")),
           userId,
           scores: scoreQuery.data
         });
@@ -2013,28 +2019,28 @@ var useInitActivity = ({
     if (!enabled) return;
     if (!assignment) {
       trackActivity({
-        activityName: _nullishCoalesce(_optionalChain([set, 'optionalAccess', _78 => _78.name]), () => ( "")),
+        activityName: _nullishCoalesce(_optionalChain([set, 'optionalAccess', _79 => _79.name]), () => ( "")),
         activityType: "set",
-        id: _optionalChain([set, 'optionalAccess', _79 => _79.id]),
-        language: _optionalChain([set, 'optionalAccess', _80 => _80.language])
+        id: _optionalChain([set, 'optionalAccess', _80 => _80.id]),
+        language: _optionalChain([set, 'optionalAccess', _81 => _81.language])
       });
     } else if (assignment.name) {
       trackActivity({
         activityName: assignment.name,
         activityType: assignment.isAssessment ? "assessment" : "assignment",
         id: assignment.id,
-        language: _optionalChain([set, 'optionalAccess', _81 => _81.language])
+        language: _optionalChain([set, 'optionalAccess', _82 => _82.language])
       });
     }
-    if (_optionalChain([set, 'optionalAccess', _82 => _82.public])) {
-      _optionalChain([SpeakableFirebaseFunctions, 'optionalAccess', _83 => _83.onSetOpened, 'optionalCall', _84 => _84({
+    if (_optionalChain([set, 'optionalAccess', _83 => _83.public])) {
+      _optionalChain([SpeakableFirebaseFunctions, 'optionalAccess', _84 => _84.onSetOpened, 'optionalCall', _85 => _85({
         setId: set.id,
         language: set.language
       })]);
     }
-    _optionalChain([SpeakableFirebaseFunctions, 'optionalAccess', _85 => _85.updateAlgoliaIndex, 'optionalCall', _86 => _86({
+    _optionalChain([SpeakableFirebaseFunctions, 'optionalAccess', _86 => _86.updateAlgoliaIndex, 'optionalCall', _87 => _87({
       updatePlays: true,
-      objectID: _optionalChain([set, 'optionalAccess', _87 => _87.id])
+      objectID: _optionalChain([set, 'optionalAccess', _88 => _88.id])
     })]);
   };
   _react.useEffect.call(void 0, () => {

package/dist/index.mjs

@@ -1371,6 +1371,7 @@ var getScore = withErrorHandler(_getScore, "getScore");
 
 // src/domains/assignment/utils/calculateScoreAndProgress.ts
 var calculateScoreAndProgress = (scores, cardsList, weights) => {
+  console.log("calculateScoreAndProgress", scores, cardsList, weights);
   const totalSetPoints = cardsList.reduce((acc, cardId) => {
     acc += weights?.[cardId] || 1;
     return acc;
@@ -1481,7 +1482,7 @@ async function clearScore(params) {
 
 // src/domains/assignment/services/submit-assignment-score.service.ts
 import dayjs4 from "dayjs";
-async function submitAssignmentScore({
+async function _submitAssignmentScore({
   cardIds,
   assignment,
   setWeights,
@@ -1513,6 +1514,10 @@ async function submitAssignmentScore({
   await api.updateDoc(path, { ...fieldsUpdated });
   return { success: true, fieldsUpdated };
 }
+var submitAssignmentScore = withErrorHandler(
+  _submitAssignmentScore,
+  "submitAssignmentScore"
+);
 async function handleAssessment(assignment, userId, cardIds, setWeights, fieldsUpdated, studentName) {
   const path = refsAssignmentFiresotre.assignmentScores({ id: assignment.id, userId });
   const response = await api.getDoc(path);
@@ -1532,7 +1537,7 @@ async function handleAssessment(assignment, userId, cardIds, setWeights, fieldsU
   return { success: true, fieldsUpdated };
 }
 async function handleCourseAssignment(assignment, userId) {
-  const { data } = await SpeakableFirebaseFunctions?.submitAssignmentV2?.({
+  await SpeakableFirebaseFunctions?.submitAssignmentV2?.({
     assignmentId: assignment.id,
     userId
   });
@@ -1622,11 +1627,11 @@ function useUpdateCardScore({
   const mutation = useMutation2({
     mutationFn: async ({ cardId, cardScore }) => {
       const previousScores = queryClient.getQueryData(queryKey);
-      console.log({
-        previousScores,
+      console.log("useUpdateCardScore", {
+        previousScores: previousScores ?? {},
         cardId,
         cardScore,
-        dataCurrentSet
+        activityId
       });
       const { progress, score, newScoreUpdated, updatedCardScore } = getScoreUpdated({
         previousScores: previousScores ?? {},
@@ -1879,9 +1884,10 @@ function useActivity({
     enabled: isAssignment
   });
   const activeAssignment = assignmentQuery.data;
-  const activityId = isAssignment ? activeAssignment?.id ?? "" : id;
-  const querySet = useSet({ setId: id ?? "", enabled: isAssignment });
+  const setId = isAssignment ? activeAssignment?.setId ?? "" : id;
+  const querySet = useSet({ setId });
   const setData = querySet.data;
+  const activityId = isAssignment ? activeAssignment?.id ?? "" : setId;
   const { cardsObject, cardsQueries, cards } = useCards({
     cardIds: setData?.content ?? [],
     enabled: querySet.isSuccess,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speakableio/core",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Speakable-io/speakable-core.git"