Added error messages for fetch/fetch_feedback when something goes wrong

Author: tuncbkose

nbgrader/nbextensions/assignment_list/assignment_list.js

@@ -381,6 +381,25 @@ define([
         return container;
     };
 
+    Assignment.prototype.fetch_error = function (data) {
+        var body = $('<div/>').attr('id', 'fetch-message');
+
+        body.append(
+            $('<div/>').append(
+                $('<p/>').text('Assignment not fetched:')
+            )
+        );
+        body.append(
+            $('<pre/>').text(data.value)
+        );
+
+        dialog.modal({
+            title: "Fetch failed",
+            body: body,
+            buttons: { OK: { class : "btn-primary" } }
+        });
+    };
+
     Assignment.prototype.submit_error = function (data) {
         var body = $('<div/>').attr('id', 'submission-message');
 
@@ -400,6 +419,25 @@ define([
         });
     };
 
+    Assignment.prototype.fetchfeedback_error = function (data) {
+        var body = $('<div/>').attr('id', 'fetchfeedback-message');
+
+        body.append(
+            $('<div/>').append(
+                $('<p/>').text('Feedback not fetched:')
+            )
+        );
+        body.append(
+            $('<pre/>').text(data.value)
+        );
+
+        dialog.modal({
+            title: "Fetch Feedback failed",
+            body: body,
+            buttons: { OK: { class : "btn-primary" } }
+        });
+    };
+
     Assignment.prototype.make_button = function () {
         var that = this;
         var container = $('<span/>').addClass('item_status col-sm-4');
@@ -417,7 +455,15 @@ define([
                     },
                     type : "POST",
                     dataType : "json",
-                    success : $.proxy(that.on_refresh, that),
+                    success : function (data, status, xhr) {
+                        if (!data.success) {
+                            that.fetch_error(data);
+                            button.text('Fetch');
+                            button.removeAttr('disabled');
+                        } else {
+                            that.on_refresh(data, status, xhr);
+                        }
+                    },
                     error : function (xhr, status, error) {
                         container.empty().text("Error fetching assignment.");
                         utils.log_ajax_error(xhr, status, error);
@@ -479,7 +525,15 @@ define([
                     },
                     type : "POST",
                     dataType : "json",
-                    success : $.proxy(that.on_refresh, that),
+                    success : function (data, status, xhr) {
+                        if (!data.success) {
+                            that.fetchfeedback_error(data);
+                            button.text('Fetch Feedback');
+                            button.removeAttr('disabled');
+                        } else {
+                            that.on_refresh(data, status, xhr);
+                        }
+                    },
                     error : function (xhr, status, error) {
                         container.empty().text("Error fetching feedback.");
                         utils.log_ajax_error(xhr, status, error);

nbgrader/server_extensions/assignment_list/handlers.py

@@ -313,8 +313,11 @@ def post(self, action):
         if action == 'fetch':
             assignment_id = data['assignment_id']
             course_id = data['course_id']
-            self.manager.fetch_assignment(course_id, assignment_id)
-            self.finish(json.dumps(self.manager.list_assignments(course_id=course_id)))
+            output = self.manager.fetch_assignment(course_id, assignment_id)
+            if output["success"]:
+                self.finish(json.dumps(self.manager.list_assignments(course_id=course_id)))
+            else:
+                self.finish(json.dumps(output))
         elif action == 'submit':
             assignment_id = data['assignment_id']
             course_id = data['course_id']
@@ -326,8 +329,11 @@ def post(self, action):
         elif action == 'fetch_feedback':
             assignment_id = data['assignment_id']
             course_id = data['course_id']
-            self.manager.fetch_feedback(course_id, assignment_id)
-            self.finish(json.dumps(self.manager.list_assignments(course_id=course_id)))
+            output = self.manager.fetch_feedback(course_id, assignment_id)
+            if output["success"]:
+                self.finish(json.dumps(self.manager.list_assignments(course_id=course_id)))
+            else:
+                self.finish(json.dumps(output))
 
 
 class CourseListHandler(BaseAssignmentHandler):

src/assignment_list/assignmentlist.ts

@@ -247,6 +247,21 @@ class Assignment {
     return container;
   };
 
+  private fetch_error(data: { value: any; }): void {
+
+    const body_title = React.createElement('p', null, 'Assignment not fetched:');
+    const body_content = React.createElement('pre', null, data.value);
+    const body = React.createElement("div", {'id': 'fetch-message'}, [body_title, body_content]);
+
+    showNbGraderDialog({
+      title: "Fetch Failed",
+      body: body,
+      buttons: [Dialog.okButton()]
+    }, true);
+
+
+  };
+
   private submit_error(data: { value: any; }): void {
 
     const body_title = React.createElement('p', null, 'Assignment not submitted:');
@@ -260,6 +275,21 @@ class Assignment {
     }, true);
 
 
+  };
+
+  private fetchfeedback_error(data: { value: any; }): void {
+
+    const body_title = React.createElement('p', null, 'Feedback not fetched:');
+    const body_content = React.createElement('pre', null, data.value);
+    const body = React.createElement("div", {'id': 'fetchfeedback-message'}, [body_title, body_content]);
+
+    showNbGraderDialog({
+      title: "Fetch Failed",
+      body: body,
+      buttons: [Dialog.okButton()]
+    }, true);
+
+
   };
 
   private make_button(): HTMLSpanElement{
@@ -282,7 +312,13 @@ class Assignment {
             method: 'POST'
           });
 
-          that.on_refresh(reply);
+          if(!reply.success){
+              that.fetch_error(reply);
+              button.innerText = 'Fetch'
+              button.removeAttribute('disabled')
+            }else{
+              that.on_refresh(reply);
+            }
         } catch (reason) {
           remove_children(container);
           container.innerText = 'Error fetching assignment.';
@@ -335,7 +371,13 @@ class Assignment {
             method: 'POST'
           });
 
-          that.on_refresh(reply);
+          if(!reply.success){
+              that.fetchfeedback_error(reply);
+              button.innerText = 'Fetch Feedback'
+              button.removeAttribute('disabled')
+            }else{
+              that.on_refresh(reply);
+            }
 
         } catch (reason) {
           remove_children(container);

style/validation_message.css

@@ -1,10 +1,14 @@
+#fetch-message p,
 #submission-message p,
+#fetchfeedback-message p,
 #validation-message p {
     margin-bottom: 1em;
     padding-top: 1em;
 }
 
+#fetch-message pre,
 #submission-message pre,
+#fetchfeedback-message pre,
 #validation-message pre {
     border: solid var(--jp-border-color2) 1px;
     padding: 5px;