@magmamath/students-features 0.6.5-rcc-0 → 0.6.5

package/dist/commonjs/features/feedback/model/comments.js

@@ -30,13 +30,12 @@ class TeacherCommentsModel {
     })
   })).on(this.add, (state, {
     assignmentId,
-    problemId,
     comment,
     isRead
   }) => (0, _helpers.updateCommentsState)({
     state,
     assignmentId,
-    problemId,
+    problemId: comment.problemId,
     fn: data => ({
       comments: [...data.comments, comment],
       unreadMessagesCount: isRead ? data.unreadMessagesCount : data.unreadMessagesCount + 1
@@ -83,7 +82,10 @@ class TeacherCommentsModel {
       },
       filter: ({
         isOpen
-      }) => isOpen,
+      }, {
+        problemId,
+        comment
+      }) => isOpen && comment.problemId === problemId,
       fn: (_, {
         comment
       }) => ({

package/dist/commonjs/features/feedback/model/comments.js.map

@@ -1 +1 @@
-{"version":3,"names":["_effector","require","_helpers","_helpers2","_studentsFeatures","TeacherCommentsModel","setNoCommentsMessage","createEvent","setAllCommentsRead","add","delete","setData","$data","restore","on","state","assignmentId","problemId","updateCommentsState","fn","data","comments","map","comment","isRead","unreadMessagesCount","commentId","commentToDelete","find","_id","filteredComments","filter","length","undefined","noCommentsMessage","exerciseId","constructor","api","$isOpen","sample","clock","source","isOpen","_","ids","target","updateCommentStatusSeenFx","deletedMessage","hasNoMessages","get","EMPTY_COMMENT","content","getText","exports"],"sourceRoot":"../../../../../src","sources":["features/feedback/model/comments.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AAGA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAOO,MAAMI,oBAAoB,CAAC;EACfC,oBAAoB,GAAG,IAAAC,qBAAW,EAAiB,CAAC;EACrDC,kBAAkB,GAAG,IAAAD,qBAAW,EAAU,CAAC;EAC3CE,GAAG,GAAG,IAAAF,qBAAW,EAAkB,CAAC;EACpCG,MAAM,GAAG,IAAAH,qBAAW,EAAqB,CAAC;EAE1CI,OAAO,GAAG,IAAAJ,qBAAW,EAAc,CAAC;EACpCK,KAAK,GAAG,IAAAC,iBAAO,EAAqB,IAAI,CAACF,OAAO,EAAE,IAAI,CAAC,CACpEG,EAAE,CAAC,IAAI,CAACN,kBAAkB,EAAE,CAACO,KAAK,EAAE;IAAEC,YAAY;IAAEC;EAAU,CAAC,KAC9D,IAAAC,4BAAmB,EAAC;IAClBH,KAAK;IACLC,YAAY;IACZC,SAAS;IACTE,EAAE,EAAEC,IAAI,KAAK;MACXC,QAAQ,EAAED,IAAI,CAACC,QAAQ,CAACC,GAAG,CAACC,OAAO,KAAK;QAAE,GAAGA,OAAO;QAAEC,MAAM,EAAE;MAAK,CAAC,CAAC,CAAC;MACtEC,mBAAmB,EAAE;IACvB,CAAC;EACH,CAAC,CACH,CAAC,CACAX,EAAE,CAAC,IAAI,CAACL,GAAG,EAAE,CAACM,KAAK,EAAE;IAAEC,YAAY;IAAEC,SAAS;IAAEM,OAAO;IAAEC;EAAO,CAAC,KAChE,IAAAN,4BAAmB,EAAC;IAClBH,KAAK;IACLC,YAAY;IACZC,SAAS;IACTE,EAAE,EAAEC,IAAI,KAAK;MACXC,QAAQ,EAAE,CAAC,GAAGD,IAAI,CAACC,QAAQ,EAAEE,OAAO,CAAC;MACrCE,mBAAmB,EAAED,MAAM,GAAGJ,IAAI,CAACK,mBAAmB,GAAGL,IAAI,CAACK,mBAAmB,GAAG;IACtF,CAAC;EACH,CAAC,CACH,CAAC,CACAX,EAAE,CAAC,IAAI,CAACJ,MAAM,EAAE,CAACK,KAAK,EAAE;IAAEC,YAAY;IAAEC,SAAS;IAAES;EAAU,CAAC,KAC7D,IAAAR,4BAAmB,EAAC;IAClBH,KAAK;IACLC,YAAY;IACZC,SAAS;IACTE,EAAE,EAAEC,IAAI,IAAI;MACV,MAAMO,eAAe,GAAGP,IAAI,CAACC,QAAQ,CAACO,IAAI,CAAC,CAAC;QAAEC;MAAI,CAAC,KAAKA,GAAG,KAAKH,SAAS,CAAC;MAC1E,IAAI,CAACC,eAAe,EAAE,OAAOP,IAAI;MAEjC,MAAMU,gBAAgB,GAAGV,IAAI,CAACC,QAAQ,CAACU,MAAM,CAAC,CAAC;QAAEF;MAAI,CAAC,KAAKA,GAAG,KAAKH,SAAS,CAAC;MAC7E,IAAI,CAACI,gBAAgB,CAACE,MAAM,EAAE,OAAOC,SAAS;MAE9C,OAAO;QACLZ,QAAQ,EAAES,gBAAgB;QAC1BL,mBAAmB,EAAEE,eAAe,CAACH,MAAM,GACvCJ,IAAI,CAACK,mBAAmB,GACxBL,IAAI,CAACK,mBAAmB,GAAG;MACjC,CAAC;IACH;EACF,CAAC,CACH,CAAC,CACAX,EAAE,CAAC,IAAI,CAACR,oBAAoB,EAAE,CAACS,KAAK,EAAEmB,iBAAiB,KACtD,IAAAhB,4BAAmB,EAAC;IAClBH,KAAK;IACLC,YAAY,EAAEkB,iBAAiB,CAACC,UAAU;IAC1ClB,SAAS,EAAEiB,iBAAiB,CAACjB,SAAS;IACtCE,EAAE,EAAEA,CAAA,MAAO;MACTE,QAAQ,EAAE,CAACa,iBAAiB,CAAC;MAC7BT,mBAAmB,EAAE;IACvB,CAAC;EACH,CAAC,CACH,CAAC;EAEHW,WAAWA,CAAC;IAAEC,GAAG;IAAEC;EAAmC,CAAC,EAAE;IACvD,IAAAC,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAAC/B,GAAG;MACfgC,MAAM,EAAE;QAAEC,MAAM,EAAEJ;MAAQ,CAAC;MAC3BP,MAAM,EAAEA,CAAC;QAAEW;MAAO,CAAC,KAAKA,MAAM;MAC9BvB,EAAE,EAAEA,CAACwB,CAAC,EAAE;QAAEpB;MAAQ,CAAC,MAAM;QACvBqB,GAAG,EAAE,CAACrB,OAAO,CAACM,GAAG;MACnB,CAAC,CAAC;MACFgB,MAAM,EAAER,GAAG,CAACS;IACd,CAAC,CAAC;;IAEF;IACA,IAAAP,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAAC9B,MAAM;MAClB+B,MAAM,EAAE;QAAEC,MAAM,EAAEJ,OAAO;QAAEvB,KAAK,EAAE,IAAI,CAACH;MAAM,CAAC;MAC9CmB,MAAM,EAAEA,CAAC;QAAEW,MAAM;QAAE3B;MAAM,CAAC,EAAEgC,cAAc,KAAK;QAC7C,MAAMC,aAAa,GAAG,CAACjC,KAAK,EAAEkC,GAAG,CAACF,cAAc,CAAC/B,YAAY,CAAC,GAAG+B,cAAc,CAAC9B,SAAS,CAAC,EACtFI,QAAQ,CAACW,MAAM;QACnB,OAAOU,MAAM,IAAIM,aAAa;MAChC,CAAC;MACD7B,EAAE,EAAEA,CAACwB,CAAC,EAAE;QAAE3B,YAAY;QAAEC;MAAU,CAAC,MAAsB;QACvD,GAAGiC,+BAAa;QAChBf,UAAU,EAAEnB,YAAY;QACxBC,SAAS;QACTkC,OAAO,EAAE,IAAAC,iBAAO,EAAC,4BAA4B;MAC/C,CAAC,CAAC;MACFP,MAAM,EAAE,IAAI,CAACvC;IACf,CAAC,CAAC;EACJ;AACF;AAAC+C,OAAA,CAAAhD,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"version":3,"names":["_effector","require","_helpers","_helpers2","_studentsFeatures","TeacherCommentsModel","setNoCommentsMessage","createEvent","setAllCommentsRead","add","delete","setData","$data","restore","on","state","assignmentId","problemId","updateCommentsState","fn","data","comments","map","comment","isRead","unreadMessagesCount","commentId","commentToDelete","find","_id","filteredComments","filter","length","undefined","noCommentsMessage","exerciseId","constructor","api","$isOpen","sample","clock","source","isOpen","_","ids","target","updateCommentStatusSeenFx","deletedMessage","hasNoMessages","get","EMPTY_COMMENT","content","getText","exports"],"sourceRoot":"../../../../../src","sources":["features/feedback/model/comments.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AAGA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAOO,MAAMI,oBAAoB,CAAC;EACfC,oBAAoB,GAAG,IAAAC,qBAAW,EAAiB,CAAC;EACrDC,kBAAkB,GAAG,IAAAD,qBAAW,EAAU,CAAC;EAC3CE,GAAG,GAAG,IAAAF,qBAAW,EAAkB,CAAC;EACpCG,MAAM,GAAG,IAAAH,qBAAW,EAAqB,CAAC;EAE1CI,OAAO,GAAG,IAAAJ,qBAAW,EAAc,CAAC;EACpCK,KAAK,GAAG,IAAAC,iBAAO,EAAqB,IAAI,CAACF,OAAO,EAAE,IAAI,CAAC,CACpEG,EAAE,CAAC,IAAI,CAACN,kBAAkB,EAAE,CAACO,KAAK,EAAE;IAAEC,YAAY;IAAEC;EAAU,CAAC,KAC9D,IAAAC,4BAAmB,EAAC;IAClBH,KAAK;IACLC,YAAY;IACZC,SAAS;IACTE,EAAE,EAAGC,IAAI,KAAM;MACbC,QAAQ,EAAED,IAAI,CAACC,QAAQ,CAACC,GAAG,CAAEC,OAAO,KAAM;QAAE,GAAGA,OAAO;QAAEC,MAAM,EAAE;MAAK,CAAC,CAAC,CAAC;MACxEC,mBAAmB,EAAE;IACvB,CAAC;EACH,CAAC,CACH,CAAC,CACAX,EAAE,CAAC,IAAI,CAACL,GAAG,EAAE,CAACM,KAAK,EAAE;IAAEC,YAAY;IAAEO,OAAO;IAAEC;EAAO,CAAC,KACrD,IAAAN,4BAAmB,EAAC;IAClBH,KAAK;IACLC,YAAY;IACZC,SAAS,EAAEM,OAAO,CAACN,SAAS;IAC5BE,EAAE,EAAGC,IAAI,KAAM;MACbC,QAAQ,EAAE,CAAC,GAAGD,IAAI,CAACC,QAAQ,EAAEE,OAAO,CAAC;MACrCE,mBAAmB,EAAED,MAAM,GAAGJ,IAAI,CAACK,mBAAmB,GAAGL,IAAI,CAACK,mBAAmB,GAAG;IACtF,CAAC;EACH,CAAC,CACH,CAAC,CACAX,EAAE,CAAC,IAAI,CAACJ,MAAM,EAAE,CAACK,KAAK,EAAE;IAAEC,YAAY;IAAEC,SAAS;IAAES;EAAU,CAAC,KAC7D,IAAAR,4BAAmB,EAAC;IAClBH,KAAK;IACLC,YAAY;IACZC,SAAS;IACTE,EAAE,EAAGC,IAAI,IAAK;MACZ,MAAMO,eAAe,GAAGP,IAAI,CAACC,QAAQ,CAACO,IAAI,CAAC,CAAC;QAAEC;MAAI,CAAC,KAAKA,GAAG,KAAKH,SAAS,CAAC;MAC1E,IAAI,CAACC,eAAe,EAAE,OAAOP,IAAI;MAEjC,MAAMU,gBAAgB,GAAGV,IAAI,CAACC,QAAQ,CAACU,MAAM,CAAC,CAAC;QAAEF;MAAI,CAAC,KAAKA,GAAG,KAAKH,SAAS,CAAC;MAC7E,IAAI,CAACI,gBAAgB,CAACE,MAAM,EAAE,OAAOC,SAAS;MAE9C,OAAO;QACLZ,QAAQ,EAAES,gBAAgB;QAC1BL,mBAAmB,EAAEE,eAAe,CAACH,MAAM,GACvCJ,IAAI,CAACK,mBAAmB,GACxBL,IAAI,CAACK,mBAAmB,GAAG;MACjC,CAAC;IACH;EACF,CAAC,CACH,CAAC,CACAX,EAAE,CAAC,IAAI,CAACR,oBAAoB,EAAE,CAACS,KAAK,EAAEmB,iBAAiB,KACtD,IAAAhB,4BAAmB,EAAC;IAClBH,KAAK;IACLC,YAAY,EAAEkB,iBAAiB,CAACC,UAAU;IAC1ClB,SAAS,EAAEiB,iBAAiB,CAACjB,SAAS;IACtCE,EAAE,EAAEA,CAAA,MAAO;MACTE,QAAQ,EAAE,CAACa,iBAAiB,CAAC;MAC7BT,mBAAmB,EAAE;IACvB,CAAC;EACH,CAAC,CACH,CAAC;EAEHW,WAAWA,CAAC;IAAEC,GAAG;IAAEC;EAAmC,CAAC,EAAE;IACvD,IAAAC,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAAC/B,GAAG;MACfgC,MAAM,EAAE;QAAEC,MAAM,EAAEJ;MAAQ,CAAC;MAC3BP,MAAM,EAAEA,CAAC;QAAEW;MAAO,CAAC,EAAE;QAAEzB,SAAS;QAAEM;MAAQ,CAAC,KAAKmB,MAAM,IAAInB,OAAO,CAACN,SAAS,KAAKA,SAAS;MACzFE,EAAE,EAAEA,CAACwB,CAAC,EAAE;QAAEpB;MAAQ,CAAC,MAAM;QACvBqB,GAAG,EAAE,CAACrB,OAAO,CAACM,GAAG;MACnB,CAAC,CAAC;MACFgB,MAAM,EAAER,GAAG,CAACS;IACd,CAAC,CAAC;;IAEF;IACA,IAAAP,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAAC9B,MAAM;MAClB+B,MAAM,EAAE;QAAEC,MAAM,EAAEJ,OAAO;QAAEvB,KAAK,EAAE,IAAI,CAACH;MAAM,CAAC;MAC9CmB,MAAM,EAAEA,CAAC;QAAEW,MAAM;QAAE3B;MAAM,CAAC,EAAEgC,cAAc,KAAK;QAC7C,MAAMC,aAAa,GAAG,CAACjC,KAAK,EAAEkC,GAAG,CAACF,cAAc,CAAC/B,YAAY,CAAC,GAAG+B,cAAc,CAAC9B,SAAS,CAAC,EACtFI,QAAQ,CAACW,MAAM;QACnB,OAAOU,MAAM,IAAIM,aAAa;MAChC,CAAC;MACD7B,EAAE,EAAEA,CAACwB,CAAC,EAAE;QAAE3B,YAAY;QAAEC;MAAU,CAAC,MAAsB;QACvD,GAAGiC,+BAAa;QAChBf,UAAU,EAAEnB,YAAY;QACxBC,SAAS;QACTkC,OAAO,EAAE,IAAAC,iBAAO,EAAC,4BAA4B;MAC/C,CAAC,CAAC;MACFP,MAAM,EAAE,IAAI,CAACvC;IACf,CAAC,CAAC;EACJ;AACF;AAAC+C,OAAA,CAAAhD,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/dist/commonjs/features/feedback/model/model.js

@@ -52,7 +52,7 @@ class TeacherFeedbackModel {
       fn: ({
         assignmentId,
         problemId
-      }, comment) => ({
+      }) => ({
         assignmentId,
         problemId,
         commentId: _constants.EMPTY_COMMENT_ID
@@ -101,25 +101,11 @@ class TeacherFeedbackModel {
     });
     (0, _effector.sample)({
       clock: this.sockets.commentDeleted,
-      source: {
-        assignmentId: credits.$assignmentId
-      },
-      fn: ({
-        assignmentId
-      }, comment) => {
-        console.log('comment deleted', comment);
-        console.log('assignmentId ', assignmentId);
-        return {
-          assignmentId,
-          problemId: comment.problemId,
-          commentId: comment._id
-        };
-      },
-      //   ({
-      //   assignmentId,
-      //   problemId: comment.problemId,
-      //   commentId: comment._id,
-      // }),
+      fn: comment => ({
+        assignmentId: comment.exerciseId,
+        problemId: comment.problemId,
+        commentId: comment._id
+      }),
       target: this.comments.delete
     });
     (0, _effector.sample)({
@@ -129,26 +115,19 @@ class TeacherFeedbackModel {
         problemId: credits.$problemId,
         isOpen: this.$isOpen
       },
+      filter: ({
+        assignmentId
+      }, comment) => assignmentId === comment.exerciseId,
       fn: ({
         assignmentId,
         problemId,
         isOpen
-      }, comment) => {
-        console.log('comment added', comment);
-        console.log('assignmentId ', assignmentId);
-        return {
-          comment,
-          assignmentId,
-          problemId: comment.problemId,
-          isRead: isOpen && comment.problemId === problemId
-        };
-      },
-      //   ({
-      //   comment,
-      //   assignmentId,
-      //   problemId: comment.problemId,
-      //   isRead: isOpen && comment.problemId === problemId,
-      // }),
+      }, comment) => ({
+        comment,
+        assignmentId,
+        problemId,
+        isRead: isOpen && comment.problemId === problemId
+      }),
       target: this.comments.add
     });
   }

package/dist/commonjs/features/feedback/model/model.js.map

@@ -1 +1 @@
-{"version":3,"names":["_effector","require","_api","_sockets","_comments","_helpers","_constants","TeacherFeedbackModel","setIsOpen","createEvent","$isOpen","restore","setIsFeedbackIconDisplayed","$isFeedbackIconDisplayed","constructor","api","socket","credits","TeacherFeedbackAPI","sockets","TeacherFeedbackSockets","comments","TeacherCommentsModel","sample","clock","$problemId","fn","target","source","data","$data","assignmentId","$assignmentId","problemId","filter","isOpen","get","isOnlyNoCommentsMessage","length","_id","EMPTY_COMMENT_ID","comment","commentId","delete","findCommentsByCredits","hasUnreadComments","some","isRead","ids","map","updateCommentStatusSeenFx","pending","setAllCommentsRead","getCommentsFx","done","params","result","generateCommentsMap","id","setData","commentDeleted","console","log","commentAdded","add","exports"],"sourceRoot":"../../../../../src","sources":["features/feedback/model/model.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_effector","require","_api","_sockets","_comments","_helpers","_constants","TeacherFeedbackModel","setIsOpen","createEvent","$isOpen","restore","setIsFeedbackIconDisplayed","$isFeedbackIconDisplayed","constructor","api","socket","credits","TeacherFeedbackAPI","sockets","TeacherFeedbackSockets","comments","TeacherCommentsModel","sample","clock","$problemId","fn","target","source","data","$data","assignmentId","$assignmentId","problemId","filter","isOpen","get","isOnlyNoCommentsMessage","length","_id","EMPTY_COMMENT_ID","commentId","delete","findCommentsByCredits","hasUnreadComments","some","isRead","ids","map","updateCommentStatusSeenFx","pending","setAllCommentsRead","getCommentsFx","done","params","result","generateCommentsMap","id","setData","commentDeleted","comment","exerciseId","commentAdded","add","exports"],"sourceRoot":"../../../../../src","sources":["features/feedback/model/model.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AACA,IAAAG,SAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AAEA,IAAAK,UAAA,GAAAL,OAAA;AAcO,MAAMM,oBAAoB,CAAC;EAIhBC,SAAS,GAAG,IAAAC,qBAAW,EAAU,CAAC;EAClCC,OAAO,GAAG,IAAAC,iBAAO,EAAC,IAAI,CAACH,SAAS,EAAE,KAAK,CAAC;EAExCI,0BAA0B,GAAG,IAAAH,qBAAW,EAAU,CAAC;EACnDI,wBAAwB,GAAG,IAAAF,iBAAO,EAAC,IAAI,CAACC,0BAA0B,EAAE,IAAI,CAAC;EAEzFE,WAAWA,CAAC;IAAEC,GAAG;IAAEC,MAAM;IAAEC;EAAmC,CAAC,EAAE;IAC/D,IAAI,CAACF,GAAG,GAAG,IAAIG,uBAAkB,CAACH,GAAG,CAAC;IACtC,IAAI,CAACI,OAAO,GAAG,IAAIC,+BAAsB,CAACJ,MAAM,CAAC;IACjD,IAAI,CAACK,QAAQ,GAAG,IAAIC,8BAAoB,CAAC;MACvCP,GAAG,EAAE,IAAI,CAACA,GAAG;MACbL,OAAO,EAAE,IAAI,CAACA;IAChB,CAAC,CAAC;IAEF,IAAAa,gBAAM,EAAC;MACLC,KAAK,EAAEP,OAAO,CAACQ,UAAU;MACzBC,EAAE,EAAEA,CAAA,KAAM,KAAK;MACfC,MAAM,EAAE,IAAI,CAACnB;IACf,CAAC,CAAC;;IAEF;IACA,IAAAe,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAAChB,SAAS;MACrBoB,MAAM,EAAE;QACNC,IAAI,EAAE,IAAI,CAACR,QAAQ,CAACS,KAAK;QACzBC,YAAY,EAAEd,OAAO,CAACe,aAAa;QACnCC,SAAS,EAAEhB,OAAO,CAACQ;MACrB,CAAC;MACDS,MAAM,EAAEA,CAAC;QAAEL,IAAI;QAAEE,YAAY;QAAEE;MAAU,CAAC,EAAEE,MAAM,KAAK;QACrD,MAAMd,QAAQ,GAAGQ,IAAI,EAAEO,GAAG,CAACL,YAAY,CAAC,GAAGE,SAAS,CAAC,EAAEZ,QAAQ;QAC/D,MAAMgB,uBAAuB,GAC3BhB,QAAQ,EAAEiB,MAAM,KAAK,CAAC,IAAIjB,QAAQ,CAAC,CAAC,CAAC,CAACkB,GAAG,KAAKC,2BAAgB;QAChE,OAAO,CAACL,MAAM,IAAIE,uBAAuB;MAC3C,CAAC;MACDX,EAAE,EAAEA,CAAC;QAAEK,YAAY;QAAEE;MAAU,CAAC,MAAM;QACpCF,YAAY;QACZE,SAAS;QACTQ,SAAS,EAAED;MACb,CAAC,CAAC;MACFb,MAAM,EAAE,IAAI,CAACN,QAAQ,CAACqB;IACxB,CAAC,CAAC;IAEF,IAAAnB,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAAChB,SAAS;MACrBoB,MAAM,EAAE;QACNC,IAAI,EAAE,IAAI,CAACR,QAAQ,CAACS,KAAK;QACzBC,YAAY,EAAEd,OAAO,CAACe,aAAa;QACnCC,SAAS,EAAEhB,OAAO,CAACQ;MACrB,CAAC;MACDS,MAAM,EAAEA,CAACN,MAAM,EAAEO,MAAM,KAAK;QAC1B,MAAMd,QAAQ,GAAG,IAAAsB,8BAAqB,EAACf,MAAM,CAAC;QAC9C,MAAMgB,iBAAiB,GAAGvB,QAAQ,CAACwB,IAAI,CAAC,CAAC;UAAEC;QAAO,CAAC,KAAK,CAACA,MAAM,CAAC;QAChE,OAAOX,MAAM,IAAIS,iBAAiB;MACpC,CAAC;MACDlB,EAAE,EAAGE,MAAM,IAAK;QACd,MAAMP,QAAQ,GAAG,IAAAsB,8BAAqB,EAACf,MAAM,CAAC;QAC9C,OAAO;UAAEmB,GAAG,EAAE1B,QAAQ,CAAC2B,GAAG,CAAC,CAAC;YAAET;UAAI,CAAC,KAAKA,GAAG;QAAE,CAAC;MAChD,CAAC;MACDZ,MAAM,EAAE,IAAI,CAACZ,GAAG,CAACkC;IACnB,CAAC,CAAC;IAEF,IAAA1B,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAACT,GAAG,CAACkC,yBAAyB,CAACC,OAAO;MACjDtB,MAAM,EAAE;QAAEG,YAAY,EAAEd,OAAO,CAACe,aAAa;QAAEC,SAAS,EAAEhB,OAAO,CAACQ;MAAW,CAAC;MAC9EE,MAAM,EAAE,IAAI,CAACN,QAAQ,CAAC8B;IACxB,CAAC,CAAC;IAEF,IAAA5B,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAACT,GAAG,CAACqC,aAAa,CAACC,IAAI;MAClC3B,EAAE,EAAEA,CAAC;QAAE4B,MAAM;QAAEC;MAAO,CAAC,KAAK,IAAAC,4BAAmB,EAACF,MAAM,CAACG,EAAE,EAAEF,MAAM,CAAC;MAClE5B,MAAM,EAAE,IAAI,CAACN,QAAQ,CAACqC;IACxB,CAAC,CAAC;IAEF,IAAAnC,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAACL,OAAO,CAACwC,cAAc;MAClCjC,EAAE,EAAGkC,OAAO,KAAM;QAChB7B,YAAY,EAAE6B,OAAO,CAACC,UAAU;QAChC5B,SAAS,EAAE2B,OAAO,CAAC3B,SAAS;QAC5BQ,SAAS,EAAEmB,OAAO,CAACrB;MACrB,CAAC,CAAC;MACFZ,MAAM,EAAE,IAAI,CAACN,QAAQ,CAACqB;IACxB,CAAC,CAAC;IAEF,IAAAnB,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAACL,OAAO,CAAC2C,YAAY;MAChClC,MAAM,EAAE;QACNG,YAAY,EAAEd,OAAO,CAACe,aAAa;QACnCC,SAAS,EAAEhB,OAAO,CAACQ,UAAU;QAC7BU,MAAM,EAAE,IAAI,CAACzB;MACf,CAAC;MACDwB,MAAM,EAAEA,CAAC;QAAEH;MAAa,CAAC,EAAE6B,OAAO,KAAK7B,YAAY,KAAK6B,OAAO,CAACC,UAAU;MAC1EnC,EAAE,EAAEA,CAAC;QAAEK,YAAY;QAAEE,SAAS;QAAEE;MAAO,CAAC,EAAEyB,OAAO,MAAM;QACrDA,OAAO;QACP7B,YAAY;QACZE,SAAS;QACTa,MAAM,EAAEX,MAAM,IAAIyB,OAAO,CAAC3B,SAAS,KAAKA;MAC1C,CAAC,CAAC;MACFN,MAAM,EAAE,IAAI,CAACN,QAAQ,CAAC0C;IACxB,CAAC,CAAC;EACJ;AACF;AAACC,OAAA,CAAAzD,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/dist/module/features/feedback/model/comments.js

@@ -26,13 +26,12 @@ export class TeacherCommentsModel {
     })
   })).on(this.add, (state, {
     assignmentId,
-    problemId,
     comment,
     isRead
   }) => updateCommentsState({
     state,
     assignmentId,
-    problemId,
+    problemId: comment.problemId,
     fn: data => ({
       comments: [...data.comments, comment],
       unreadMessagesCount: isRead ? data.unreadMessagesCount : data.unreadMessagesCount + 1
@@ -79,7 +78,10 @@ export class TeacherCommentsModel {
       },
       filter: ({
         isOpen
-      }) => isOpen,
+      }, {
+        problemId,
+        comment
+      }) => isOpen && comment.problemId === problemId,
       fn: (_, {
         comment
       }) => ({

package/dist/module/features/feedback/model/comments.js.map

@@ -1 +1 @@
-{"version":3,"names":["createEvent","restore","sample","updateCommentsState","getText","EMPTY_COMMENT","TeacherCommentsModel","setNoCommentsMessage","setAllCommentsRead","add","delete","setData","$data","on","state","assignmentId","problemId","fn","data","comments","map","comment","isRead","unreadMessagesCount","commentId","commentToDelete","find","_id","filteredComments","filter","length","undefined","noCommentsMessage","exerciseId","constructor","api","$isOpen","clock","source","isOpen","_","ids","target","updateCommentStatusSeenFx","deletedMessage","hasNoMessages","get","content"],"sourceRoot":"../../../../../src","sources":["features/feedback/model/comments.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createEvent","restore","sample","updateCommentsState","getText","EMPTY_COMMENT","TeacherCommentsModel","setNoCommentsMessage","setAllCommentsRead","add","delete","setData","$data","on","state","assignmentId","problemId","fn","data","comments","map","comment","isRead","unreadMessagesCount","commentId","commentToDelete","find","_id","filteredComments","filter","length","undefined","noCommentsMessage","exerciseId","constructor","api","$isOpen","clock","source","isOpen","_","ids","target","updateCommentStatusSeenFx","deletedMessage","hasNoMessages","get","content"],"sourceRoot":"../../../../../src","sources":["features/feedback/model/comments.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,OAAO,EAAEC,MAAM,QAAe,UAAU;AAG9D,SAASC,mBAAmB,QAAQ,eAAY;AAChD,SAASC,OAAO,QAAQ,wCAAqC;AAC7D,SAASC,aAAa,QAAQ,8BAA8B;AAO5D,OAAO,MAAMC,oBAAoB,CAAC;EACfC,oBAAoB,GAAGP,WAAW,CAAiB,CAAC;EACrDQ,kBAAkB,GAAGR,WAAW,CAAU,CAAC;EAC3CS,GAAG,GAAGT,WAAW,CAAkB,CAAC;EACpCU,MAAM,GAAGV,WAAW,CAAqB,CAAC;EAE1CW,OAAO,GAAGX,WAAW,CAAc,CAAC;EACpCY,KAAK,GAAGX,OAAO,CAAqB,IAAI,CAACU,OAAO,EAAE,IAAI,CAAC,CACpEE,EAAE,CAAC,IAAI,CAACL,kBAAkB,EAAE,CAACM,KAAK,EAAE;IAAEC,YAAY;IAAEC;EAAU,CAAC,KAC9Db,mBAAmB,CAAC;IAClBW,KAAK;IACLC,YAAY;IACZC,SAAS;IACTC,EAAE,EAAGC,IAAI,KAAM;MACbC,QAAQ,EAAED,IAAI,CAACC,QAAQ,CAACC,GAAG,CAAEC,OAAO,KAAM;QAAE,GAAGA,OAAO;QAAEC,MAAM,EAAE;MAAK,CAAC,CAAC,CAAC;MACxEC,mBAAmB,EAAE;IACvB,CAAC;EACH,CAAC,CACH,CAAC,CACAV,EAAE,CAAC,IAAI,CAACJ,GAAG,EAAE,CAACK,KAAK,EAAE;IAAEC,YAAY;IAAEM,OAAO;IAAEC;EAAO,CAAC,KACrDnB,mBAAmB,CAAC;IAClBW,KAAK;IACLC,YAAY;IACZC,SAAS,EAAEK,OAAO,CAACL,SAAS;IAC5BC,EAAE,EAAGC,IAAI,KAAM;MACbC,QAAQ,EAAE,CAAC,GAAGD,IAAI,CAACC,QAAQ,EAAEE,OAAO,CAAC;MACrCE,mBAAmB,EAAED,MAAM,GAAGJ,IAAI,CAACK,mBAAmB,GAAGL,IAAI,CAACK,mBAAmB,GAAG;IACtF,CAAC;EACH,CAAC,CACH,CAAC,CACAV,EAAE,CAAC,IAAI,CAACH,MAAM,EAAE,CAACI,KAAK,EAAE;IAAEC,YAAY;IAAEC,SAAS;IAAEQ;EAAU,CAAC,KAC7DrB,mBAAmB,CAAC;IAClBW,KAAK;IACLC,YAAY;IACZC,SAAS;IACTC,EAAE,EAAGC,IAAI,IAAK;MACZ,MAAMO,eAAe,GAAGP,IAAI,CAACC,QAAQ,CAACO,IAAI,CAAC,CAAC;QAAEC;MAAI,CAAC,KAAKA,GAAG,KAAKH,SAAS,CAAC;MAC1E,IAAI,CAACC,eAAe,EAAE,OAAOP,IAAI;MAEjC,MAAMU,gBAAgB,GAAGV,IAAI,CAACC,QAAQ,CAACU,MAAM,CAAC,CAAC;QAAEF;MAAI,CAAC,KAAKA,GAAG,KAAKH,SAAS,CAAC;MAC7E,IAAI,CAACI,gBAAgB,CAACE,MAAM,EAAE,OAAOC,SAAS;MAE9C,OAAO;QACLZ,QAAQ,EAAES,gBAAgB;QAC1BL,mBAAmB,EAAEE,eAAe,CAACH,MAAM,GACvCJ,IAAI,CAACK,mBAAmB,GACxBL,IAAI,CAACK,mBAAmB,GAAG;MACjC,CAAC;IACH;EACF,CAAC,CACH,CAAC,CACAV,EAAE,CAAC,IAAI,CAACN,oBAAoB,EAAE,CAACO,KAAK,EAAEkB,iBAAiB,KACtD7B,mBAAmB,CAAC;IAClBW,KAAK;IACLC,YAAY,EAAEiB,iBAAiB,CAACC,UAAU;IAC1CjB,SAAS,EAAEgB,iBAAiB,CAAChB,SAAS;IACtCC,EAAE,EAAEA,CAAA,MAAO;MACTE,QAAQ,EAAE,CAACa,iBAAiB,CAAC;MAC7BT,mBAAmB,EAAE;IACvB,CAAC;EACH,CAAC,CACH,CAAC;EAEHW,WAAWA,CAAC;IAAEC,GAAG;IAAEC;EAAmC,CAAC,EAAE;IACvDlC,MAAM,CAAC;MACLmC,KAAK,EAAE,IAAI,CAAC5B,GAAG;MACf6B,MAAM,EAAE;QAAEC,MAAM,EAAEH;MAAQ,CAAC;MAC3BP,MAAM,EAAEA,CAAC;QAAEU;MAAO,CAAC,EAAE;QAAEvB,SAAS;QAAEK;MAAQ,CAAC,KAAKkB,MAAM,IAAIlB,OAAO,CAACL,SAAS,KAAKA,SAAS;MACzFC,EAAE,EAAEA,CAACuB,CAAC,EAAE;QAAEnB;MAAQ,CAAC,MAAM;QACvBoB,GAAG,EAAE,CAACpB,OAAO,CAACM,GAAG;MACnB,CAAC,CAAC;MACFe,MAAM,EAAEP,GAAG,CAACQ;IACd,CAAC,CAAC;;IAEF;IACAzC,MAAM,CAAC;MACLmC,KAAK,EAAE,IAAI,CAAC3B,MAAM;MAClB4B,MAAM,EAAE;QAAEC,MAAM,EAAEH,OAAO;QAAEtB,KAAK,EAAE,IAAI,CAACF;MAAM,CAAC;MAC9CiB,MAAM,EAAEA,CAAC;QAAEU,MAAM;QAAEzB;MAAM,CAAC,EAAE8B,cAAc,KAAK;QAC7C,MAAMC,aAAa,GAAG,CAAC/B,KAAK,EAAEgC,GAAG,CAACF,cAAc,CAAC7B,YAAY,CAAC,GAAG6B,cAAc,CAAC5B,SAAS,CAAC,EACtFG,QAAQ,CAACW,MAAM;QACnB,OAAOS,MAAM,IAAIM,aAAa;MAChC,CAAC;MACD5B,EAAE,EAAEA,CAACuB,CAAC,EAAE;QAAEzB,YAAY;QAAEC;MAAU,CAAC,MAAsB;QACvD,GAAGX,aAAa;QAChB4B,UAAU,EAAElB,YAAY;QACxBC,SAAS;QACT+B,OAAO,EAAE3C,OAAO,CAAC,4BAA4B;MAC/C,CAAC,CAAC;MACFsC,MAAM,EAAE,IAAI,CAACnC;IACf,CAAC,CAAC;EACJ;AACF","ignoreList":[]}

package/dist/module/features/feedback/model/model.js

@@ -48,7 +48,7 @@ export class TeacherFeedbackModel {
       fn: ({
         assignmentId,
         problemId
-      }, comment) => ({
+      }) => ({
         assignmentId,
         problemId,
         commentId: EMPTY_COMMENT_ID
@@ -97,25 +97,11 @@ export class TeacherFeedbackModel {
     });
     sample({
       clock: this.sockets.commentDeleted,
-      source: {
-        assignmentId: credits.$assignmentId
-      },
-      fn: ({
-        assignmentId
-      }, comment) => {
-        console.log('comment deleted', comment);
-        console.log('assignmentId ', assignmentId);
-        return {
-          assignmentId,
-          problemId: comment.problemId,
-          commentId: comment._id
-        };
-      },
-      //   ({
-      //   assignmentId,
-      //   problemId: comment.problemId,
-      //   commentId: comment._id,
-      // }),
+      fn: comment => ({
+        assignmentId: comment.exerciseId,
+        problemId: comment.problemId,
+        commentId: comment._id
+      }),
       target: this.comments.delete
     });
     sample({
@@ -125,26 +111,19 @@ export class TeacherFeedbackModel {
         problemId: credits.$problemId,
         isOpen: this.$isOpen
       },
+      filter: ({
+        assignmentId
+      }, comment) => assignmentId === comment.exerciseId,
       fn: ({
         assignmentId,
         problemId,
         isOpen
-      }, comment) => {
-        console.log('comment added', comment);
-        console.log('assignmentId ', assignmentId);
-        return {
-          comment,
-          assignmentId,
-          problemId: comment.problemId,
-          isRead: isOpen && comment.problemId === problemId
-        };
-      },
-      //   ({
-      //   comment,
-      //   assignmentId,
-      //   problemId: comment.problemId,
-      //   isRead: isOpen && comment.problemId === problemId,
-      // }),
+      }, comment) => ({
+        comment,
+        assignmentId,
+        problemId,
+        isRead: isOpen && comment.problemId === problemId
+      }),
       target: this.comments.add
     });
   }

package/dist/module/features/feedback/model/model.js.map

@@ -1 +1 @@
-{"version":3,"names":["createEvent","restore","sample","TeacherFeedbackAPI","TeacherFeedbackSockets","TeacherCommentsModel","findCommentsByCredits","generateCommentsMap","EMPTY_COMMENT_ID","TeacherFeedbackModel","setIsOpen","$isOpen","setIsFeedbackIconDisplayed","$isFeedbackIconDisplayed","constructor","api","socket","credits","sockets","comments","clock","$problemId","fn","target","source","data","$data","assignmentId","$assignmentId","problemId","filter","isOpen","get","isOnlyNoCommentsMessage","length","_id","comment","commentId","delete","hasUnreadComments","some","isRead","ids","map","updateCommentStatusSeenFx","pending","setAllCommentsRead","getCommentsFx","done","params","result","id","setData","commentDeleted","console","log","commentAdded","add"],"sourceRoot":"../../../../../src","sources":["features/feedback/model/model.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createEvent","restore","sample","TeacherFeedbackAPI","TeacherFeedbackSockets","TeacherCommentsModel","findCommentsByCredits","generateCommentsMap","EMPTY_COMMENT_ID","TeacherFeedbackModel","setIsOpen","$isOpen","setIsFeedbackIconDisplayed","$isFeedbackIconDisplayed","constructor","api","socket","credits","sockets","comments","clock","$problemId","fn","target","source","data","$data","assignmentId","$assignmentId","problemId","filter","isOpen","get","isOnlyNoCommentsMessage","length","_id","commentId","delete","hasUnreadComments","some","isRead","ids","map","updateCommentStatusSeenFx","pending","setAllCommentsRead","getCommentsFx","done","params","result","id","setData","commentDeleted","comment","exerciseId","commentAdded","add"],"sourceRoot":"../../../../../src","sources":["features/feedback/model/model.ts"],"mappings":"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","ignoreList":[]}

package/dist/typescript/commonjs/features/feedback/model/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../../src/features/feedback/model/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,EAAE,MAAM,UAAU,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAGlG,MAAM,MAAM,yBAAyB,GAAG;IACtC,GAAG,EAAE;QACH,WAAW,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACxE,uBAAuB,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAClF,CAAA;IACD,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE;QACP,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC5B,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAC1B,CAAA;CACF,CAAA;AAED,qBAAa,oBAAoB;IAC/B,SAAgB,OAAO,EAAE,sBAAsB,CAAA;IAC/C,SAAgB,GAAG,EAAE,kBAAkB,CAAA;IACvC,SAAgB,QAAQ,EAAE,oBAAoB,CAAA;IAC9C,SAAgB,SAAS,4CAAyB;IAClD,SAAgB,OAAO,4CAAiC;IAExD,SAAgB,0BAA0B,4CAAyB;IACnE,SAAgB,wBAAwB,4CAAiD;gBAE7E,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,yBAAyB;CAiHhE"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../../src/features/feedback/model/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,EAAE,MAAM,UAAU,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAGlG,MAAM,MAAM,yBAAyB,GAAG;IACtC,GAAG,EAAE;QACH,WAAW,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACxE,uBAAuB,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAClF,CAAA;IACD,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE;QACP,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC5B,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAC1B,CAAA;CACF,CAAA;AAED,qBAAa,oBAAoB;IAC/B,SAAgB,OAAO,EAAE,sBAAsB,CAAA;IAC/C,SAAgB,GAAG,EAAE,kBAAkB,CAAA;IACvC,SAAgB,QAAQ,EAAE,oBAAoB,CAAA;IAC9C,SAAgB,SAAS,4CAAyB;IAClD,SAAgB,OAAO,4CAAiC;IAExD,SAAgB,0BAA0B,4CAAyB;IACnE,SAAgB,wBAAwB,4CAAiD;gBAE7E,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,yBAAyB;CA8FhE"}

package/dist/typescript/module/features/feedback/model/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../../src/features/feedback/model/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,EAAE,MAAM,UAAU,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAGlG,MAAM,MAAM,yBAAyB,GAAG;IACtC,GAAG,EAAE;QACH,WAAW,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACxE,uBAAuB,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAClF,CAAA;IACD,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE;QACP,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC5B,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAC1B,CAAA;CACF,CAAA;AAED,qBAAa,oBAAoB;IAC/B,SAAgB,OAAO,EAAE,sBAAsB,CAAA;IAC/C,SAAgB,GAAG,EAAE,kBAAkB,CAAA;IACvC,SAAgB,QAAQ,EAAE,oBAAoB,CAAA;IAC9C,SAAgB,SAAS,4CAAyB;IAClD,SAAgB,OAAO,4CAAiC;IAExD,SAAgB,0BAA0B,4CAAyB;IACnE,SAAgB,wBAAwB,4CAAiD;gBAE7E,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,yBAAyB;CAiHhE"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../../src/features/feedback/model/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,EAAE,MAAM,UAAU,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAGlG,MAAM,MAAM,yBAAyB,GAAG;IACtC,GAAG,EAAE;QACH,WAAW,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACxE,uBAAuB,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAClF,CAAA;IACD,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE;QACP,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC5B,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAC1B,CAAA;CACF,CAAA;AAED,qBAAa,oBAAoB;IAC/B,SAAgB,OAAO,EAAE,sBAAsB,CAAA;IAC/C,SAAgB,GAAG,EAAE,kBAAkB,CAAA;IACvC,SAAgB,QAAQ,EAAE,oBAAoB,CAAA;IAC9C,SAAgB,SAAS,4CAAyB;IAClD,SAAgB,OAAO,4CAAiC;IAExD,SAAgB,0BAA0B,4CAAyB;IACnE,SAAgB,wBAAwB,4CAAiD;gBAE7E,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,yBAAyB;CA8FhE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magmamath/students-features",
-  "version": "0.6.5-rcc-0",
+  "version": "0.6.5",
   "description": "Magmamath features library",
   "source": "src/index.ts",
   "main": "src/index.ts",

package/src/features/feedback/model/comments.ts

@@ -23,18 +23,18 @@ export class TeacherCommentsModel {
         state,
         assignmentId,
         problemId,
-        fn: data => ({
-          comments: data.comments.map(comment => ({ ...comment, isRead: true })),
+        fn: (data) => ({
+          comments: data.comments.map((comment) => ({ ...comment, isRead: true })),
           unreadMessagesCount: 0,
         }),
       }),
     )
-    .on(this.add, (state, { assignmentId, problemId, comment, isRead }) =>
+    .on(this.add, (state, { assignmentId, comment, isRead }) =>
       updateCommentsState({
         state,
         assignmentId,
-        problemId,
-        fn: data => ({
+        problemId: comment.problemId,
+        fn: (data) => ({
           comments: [...data.comments, comment],
           unreadMessagesCount: isRead ? data.unreadMessagesCount : data.unreadMessagesCount + 1,
         }),
@@ -45,7 +45,7 @@ export class TeacherCommentsModel {
         state,
         assignmentId,
         problemId,
-        fn: data => {
+        fn: (data) => {
           const commentToDelete = data.comments.find(({ _id }) => _id === commentId)
           if (!commentToDelete) return data
 
@@ -77,7 +77,7 @@ export class TeacherCommentsModel {
     sample({
       clock: this.add,
       source: { isOpen: $isOpen },
-      filter: ({ isOpen }) => isOpen,
+      filter: ({ isOpen }, { problemId, comment }) => isOpen && comment.problemId === problemId,
       fn: (_, { comment }) => ({
         ids: [comment._id],
       }),

package/src/features/feedback/model/model.ts

@@ -56,7 +56,7 @@ export class TeacherFeedbackModel {
           comments?.length === 1 && comments[0]._id === EMPTY_COMMENT_ID
         return !isOpen && isOnlyNoCommentsMessage
       },
-      fn: ({ assignmentId, problemId }, comment) => ({
+      fn: ({ assignmentId, problemId }) => ({
         assignmentId,
         problemId,
         commentId: EMPTY_COMMENT_ID,
@@ -97,21 +97,11 @@ export class TeacherFeedbackModel {
 
     sample({
       clock: this.sockets.commentDeleted,
-      source: { assignmentId: credits.$assignmentId },
-      fn: ({ assignmentId }, comment) => {
-        console.log('comment deleted', comment)
-        console.log('assignmentId ', assignmentId)
-        return {
-          assignmentId,
-          problemId: comment.problemId,
-          commentId: comment._id,
-        }
-      },
-      //   ({
-      //   assignmentId,
-      //   problemId: comment.problemId,
-      //   commentId: comment._id,
-      // }),
+      fn: (comment) => ({
+        assignmentId: comment.exerciseId,
+        problemId: comment.problemId,
+        commentId: comment._id,
+      }),
       target: this.comments.delete,
     })
 
@@ -122,22 +112,13 @@ export class TeacherFeedbackModel {
         problemId: credits.$problemId,
         isOpen: this.$isOpen,
       },
-      fn: ({ assignmentId, problemId, isOpen }, comment) => {
-        console.log('comment added', comment)
-        console.log('assignmentId ', assignmentId)
-        return {
-          comment,
-          assignmentId,
-          problemId: comment.problemId,
-          isRead: isOpen && comment.problemId === problemId,
-        }
-      },
-      //   ({
-      //   comment,
-      //   assignmentId,
-      //   problemId: comment.problemId,
-      //   isRead: isOpen && comment.problemId === problemId,
-      // }),
+      filter: ({ assignmentId }, comment) => assignmentId === comment.exerciseId,
+      fn: ({ assignmentId, problemId, isOpen }, comment) => ({
+        comment,
+        assignmentId,
+        problemId,
+        isRead: isOpen && comment.problemId === problemId,
+      }),
       target: this.comments.add,
     })
   }