@magmamath/students-features 0.6.5-rc-0 → 0.6.5-rc-10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commonjs/features/feedback/model/model.js +15 -36
- package/dist/commonjs/features/feedback/model/model.js.map +1 -1
- package/dist/module/features/feedback/model/model.js +15 -36
- package/dist/module/features/feedback/model/model.js.map +1 -1
- package/dist/typescript/commonjs/features/feedback/model/model.d.ts.map +1 -1
- package/dist/typescript/module/features/feedback/model/model.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/features/feedback/model/model.ts +13 -32
|
@@ -52,7 +52,7 @@ class TeacherFeedbackModel {
|
|
|
52
52
|
fn: ({
|
|
53
53
|
assignmentId,
|
|
54
54
|
problemId
|
|
55
|
-
}
|
|
55
|
+
}) => ({
|
|
56
56
|
assignmentId,
|
|
57
57
|
problemId,
|
|
58
58
|
commentId: _constants.EMPTY_COMMENT_ID
|
|
@@ -101,25 +101,11 @@ class TeacherFeedbackModel {
|
|
|
101
101
|
});
|
|
102
102
|
(0, _effector.sample)({
|
|
103
103
|
clock: this.sockets.commentDeleted,
|
|
104
|
-
|
|
105
|
-
assignmentId:
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
}, comment) => {
|
|
110
|
-
console.log('comment deleted', comment);
|
|
111
|
-
console.log('assignmentId ', assignmentId);
|
|
112
|
-
return {
|
|
113
|
-
assignmentId,
|
|
114
|
-
problemId: comment.problemId,
|
|
115
|
-
commentId: comment._id
|
|
116
|
-
};
|
|
117
|
-
},
|
|
118
|
-
// ({
|
|
119
|
-
// assignmentId,
|
|
120
|
-
// problemId: comment.problemId,
|
|
121
|
-
// commentId: comment._id,
|
|
122
|
-
// }),
|
|
104
|
+
fn: comment => ({
|
|
105
|
+
assignmentId: comment.exerciseId,
|
|
106
|
+
problemId: comment.problemId,
|
|
107
|
+
commentId: comment._id
|
|
108
|
+
}),
|
|
123
109
|
target: this.comments.delete
|
|
124
110
|
});
|
|
125
111
|
(0, _effector.sample)({
|
|
@@ -129,26 +115,19 @@ class TeacherFeedbackModel {
|
|
|
129
115
|
problemId: credits.$problemId,
|
|
130
116
|
isOpen: this.$isOpen
|
|
131
117
|
},
|
|
118
|
+
filter: ({
|
|
119
|
+
assignmentId
|
|
120
|
+
}, comment) => assignmentId === comment.exerciseId,
|
|
132
121
|
fn: ({
|
|
133
122
|
assignmentId,
|
|
134
123
|
problemId,
|
|
135
124
|
isOpen
|
|
136
|
-
}, comment) => {
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
problemId: comment.problemId,
|
|
143
|
-
isRead: isOpen && comment.problemId === problemId
|
|
144
|
-
};
|
|
145
|
-
},
|
|
146
|
-
// ({
|
|
147
|
-
// comment,
|
|
148
|
-
// assignmentId,
|
|
149
|
-
// problemId: comment.problemId,
|
|
150
|
-
// isRead: isOpen && comment.problemId === problemId,
|
|
151
|
-
// }),
|
|
125
|
+
}, comment) => ({
|
|
126
|
+
comment,
|
|
127
|
+
assignmentId,
|
|
128
|
+
problemId: comment.problemId,
|
|
129
|
+
isRead: isOpen && comment.problemId === problemId
|
|
130
|
+
}),
|
|
152
131
|
target: this.comments.add
|
|
153
132
|
});
|
|
154
133
|
}
|
|
@@ -1 +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","
|
|
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","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":"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","ignoreList":[]}
|
|
@@ -48,7 +48,7 @@ export class TeacherFeedbackModel {
|
|
|
48
48
|
fn: ({
|
|
49
49
|
assignmentId,
|
|
50
50
|
problemId
|
|
51
|
-
}
|
|
51
|
+
}) => ({
|
|
52
52
|
assignmentId,
|
|
53
53
|
problemId,
|
|
54
54
|
commentId: EMPTY_COMMENT_ID
|
|
@@ -97,25 +97,11 @@ export class TeacherFeedbackModel {
|
|
|
97
97
|
});
|
|
98
98
|
sample({
|
|
99
99
|
clock: this.sockets.commentDeleted,
|
|
100
|
-
|
|
101
|
-
assignmentId:
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
}, comment) => {
|
|
106
|
-
console.log('comment deleted', comment);
|
|
107
|
-
console.log('assignmentId ', assignmentId);
|
|
108
|
-
return {
|
|
109
|
-
assignmentId,
|
|
110
|
-
problemId: comment.problemId,
|
|
111
|
-
commentId: comment._id
|
|
112
|
-
};
|
|
113
|
-
},
|
|
114
|
-
// ({
|
|
115
|
-
// assignmentId,
|
|
116
|
-
// problemId: comment.problemId,
|
|
117
|
-
// commentId: comment._id,
|
|
118
|
-
// }),
|
|
100
|
+
fn: comment => ({
|
|
101
|
+
assignmentId: comment.exerciseId,
|
|
102
|
+
problemId: comment.problemId,
|
|
103
|
+
commentId: comment._id
|
|
104
|
+
}),
|
|
119
105
|
target: this.comments.delete
|
|
120
106
|
});
|
|
121
107
|
sample({
|
|
@@ -125,26 +111,19 @@ export class TeacherFeedbackModel {
|
|
|
125
111
|
problemId: credits.$problemId,
|
|
126
112
|
isOpen: this.$isOpen
|
|
127
113
|
},
|
|
114
|
+
filter: ({
|
|
115
|
+
assignmentId
|
|
116
|
+
}, comment) => assignmentId === comment.exerciseId,
|
|
128
117
|
fn: ({
|
|
129
118
|
assignmentId,
|
|
130
119
|
problemId,
|
|
131
120
|
isOpen
|
|
132
|
-
}, comment) => {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
problemId: comment.problemId,
|
|
139
|
-
isRead: isOpen && comment.problemId === problemId
|
|
140
|
-
};
|
|
141
|
-
},
|
|
142
|
-
// ({
|
|
143
|
-
// comment,
|
|
144
|
-
// assignmentId,
|
|
145
|
-
// problemId: comment.problemId,
|
|
146
|
-
// isRead: isOpen && comment.problemId === problemId,
|
|
147
|
-
// }),
|
|
121
|
+
}, comment) => ({
|
|
122
|
+
comment,
|
|
123
|
+
assignmentId,
|
|
124
|
+
problemId: comment.problemId,
|
|
125
|
+
isRead: isOpen && comment.problemId === problemId
|
|
126
|
+
}),
|
|
148
127
|
target: this.comments.add
|
|
149
128
|
});
|
|
150
129
|
}
|
|
@@ -1 +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","
|
|
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","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":[]}
|
|
@@ -1 +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;
|
|
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;CA8FhE"}
|
|
@@ -1 +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;
|
|
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;CA8FhE"}
|
package/package.json
CHANGED
|
@@ -56,7 +56,7 @@ export class TeacherFeedbackModel {
|
|
|
56
56
|
comments?.length === 1 && comments[0]._id === EMPTY_COMMENT_ID
|
|
57
57
|
return !isOpen && isOnlyNoCommentsMessage
|
|
58
58
|
},
|
|
59
|
-
fn: ({ assignmentId, problemId }
|
|
59
|
+
fn: ({ assignmentId, problemId }) => ({
|
|
60
60
|
assignmentId,
|
|
61
61
|
problemId,
|
|
62
62
|
commentId: EMPTY_COMMENT_ID,
|
|
@@ -97,21 +97,11 @@ export class TeacherFeedbackModel {
|
|
|
97
97
|
|
|
98
98
|
sample({
|
|
99
99
|
clock: this.sockets.commentDeleted,
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
assignmentId,
|
|
106
|
-
problemId: comment.problemId,
|
|
107
|
-
commentId: comment._id,
|
|
108
|
-
}
|
|
109
|
-
},
|
|
110
|
-
// ({
|
|
111
|
-
// assignmentId,
|
|
112
|
-
// problemId: comment.problemId,
|
|
113
|
-
// commentId: comment._id,
|
|
114
|
-
// }),
|
|
100
|
+
fn: (comment) => ({
|
|
101
|
+
assignmentId: comment.exerciseId,
|
|
102
|
+
problemId: comment.problemId,
|
|
103
|
+
commentId: comment._id,
|
|
104
|
+
}),
|
|
115
105
|
target: this.comments.delete,
|
|
116
106
|
})
|
|
117
107
|
|
|
@@ -122,22 +112,13 @@ export class TeacherFeedbackModel {
|
|
|
122
112
|
problemId: credits.$problemId,
|
|
123
113
|
isOpen: this.$isOpen,
|
|
124
114
|
},
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
isRead: isOpen && comment.problemId === problemId,
|
|
133
|
-
}
|
|
134
|
-
},
|
|
135
|
-
// ({
|
|
136
|
-
// comment,
|
|
137
|
-
// assignmentId,
|
|
138
|
-
// problemId: comment.problemId,
|
|
139
|
-
// isRead: isOpen && comment.problemId === problemId,
|
|
140
|
-
// }),
|
|
115
|
+
filter: ({ assignmentId }, comment) => assignmentId === comment.exerciseId,
|
|
116
|
+
fn: ({ assignmentId, problemId, isOpen }, comment) => ({
|
|
117
|
+
comment,
|
|
118
|
+
assignmentId,
|
|
119
|
+
problemId: comment.problemId,
|
|
120
|
+
isRead: isOpen && comment.problemId === problemId,
|
|
121
|
+
}),
|
|
141
122
|
target: this.comments.add,
|
|
142
123
|
})
|
|
143
124
|
}
|