Merge pull request #118 from OnroerendErfgoed/#92_ui_error_handling

#92 ui error handling
OnroerendErfgoed · Dec 16, 2014 · 8893c5b · 8893c5b
2 parents 8f66794 + 8399955
commit 8893c5b
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,6 +72,7 @@ atramhasis/static/admin/src/util/
 atramhasis/static/admin/src/dojo/
 atramhasis/static/admin/src/dojox/
 atramhasis/static/admin/src/dijit/
+atramhasis/static/admin/src/dGrowl/
 atramhasis/static/admin/src/dgrid/
 atramhasis/static/admin/src/put-selector/
 atramhasis/static/admin/src/xstyle/

diff --git a/atramhasis/static/admin/bower.json b/atramhasis/static/admin/bower.json
@@ -21,6 +21,7 @@
     "util": "dojo-util#~1.10.0",
     "put-selector": "~0.3.5",
     "xstyle": "~0.2.1",
-    "dgrid": "~0.3.15"
+    "dgrid": "~0.3.15",
+    "dGrowl": "~0.0.0"
   }
-}
+}
diff --git a/atramhasis/static/admin/src/app/App.js b/atramhasis/static/admin/src/app/App.js
@@ -7,6 +7,7 @@ define([
     "dojo/store/Memory",
     "dojo/dom",
     "dojo/request",
+    "dojo/json",
     "dijit/registry",
     "dijit/form/FilteringSelect",
     "dijit/MenuItem",
@@ -24,22 +25,24 @@ define([
     "./ConceptForm",
     "./ExternalSchemeService",
     "./ExternalSchemeForm",
+    "dGrowl",
     "dijit/layout/ContentPane",
     "dijit/layout/TabContainer",
     "dijit/layout/BorderContainer"
 
 
-], function (declare, on, topic, aspect, lang, Memory, dom, request, registry, FilteringSelect, MenuItem,
+], function (declare, on, topic, aspect, lang, Memory, dom, request, JSON, registry, FilteringSelect, MenuItem,
              _Widget, _TemplatedMixin, _WidgetsInTemplateMixin, template, array, ComboBox, Button, Dialog,
              FilteredGrid, ConceptDetail, ThesaurusCollection, ConceptForm, ExternalSchemeService,
-             ExternalSchemeForm, ContentPane, TabContainer) {
+             ExternalSchemeForm, dGrowl, ContentPane, TabContainer) {
     return declare([_Widget, _TemplatedMixin, _WidgetsInTemplateMixin], {
 
         templateString: template,
         thesauri: null,
         currentScheme: null,
         externalSchemeService: null,
         externalSchemeForm: null,
+        notificationController: null,
 
         postMixInProperties: function () {
             this.inherited(arguments);
@@ -57,6 +60,14 @@ define([
             this.inherited(arguments);
             console.log('postCreate', arguments);
             this.thesauri = new ThesaurusCollection();
+
+            this.notificationController = new dGrowl({
+                'channels':[
+                    {'name':'info','pos':3},
+                    {'name':'error', 'pos':1},
+                    {'name':'warn', 'pos':2}
+                ]
+            });
         },
 
         startup: function () {
@@ -308,7 +319,8 @@ define([
                         function () {
                             console.log("row edited");
                             conceptDialog.hide();
-                            alert("The concept or collection has been saved");
+                            var message = "The " + rowToAdd.type + " has been saved";
+                            topic.publish('dGrowl', message, {'title': "Success", 'sticky': false, 'channel':'info'});
                             filteredGrid.conceptGrid.refresh();
 
                             //refresh Concept Detail widget.
@@ -317,29 +329,28 @@ define([
                             });
                         },
                         function (error) {
-                            console.log("An error occurred: " + error);
-                            alert("Can't add the concept or collection to the database. Please check if business rules are respected");
+                            self._handleSaveErrors(error);
                         }
                     );
                 }
                 else {
                     filteredGrid.conceptGrid.store.add(rowToAdd)
                         .then(
                         function () {
-                            console.log("row added");
                             conceptDialog.hide();
-                            alert("The concept or collection has been added to the thesaurus");
-
+                            var message = "The " + rowToAdd.type + " has been saved";
+                            topic.publish('dGrowl', message, {'title': "Success", 'sticky': false, 'channel':'info'});
                             filteredGrid.conceptGrid.refresh();
                         },
                         function (error) {
-                            console.log("An error occurred: " + error);
-                            alert("Can't add the concept or collection to the database. Please check if business rules are respected");
+                            self._handleSaveErrors(error);
                         }
                     );
                 }
             });
 
+            this.notificationController.addNotification("Atramhasis is up and running",{'channel':'info'});
+
         },
 
         _createConcept: function (conceptForm, conceptDialog, Scheme) {
@@ -366,6 +377,21 @@ define([
             }, function(err){
                 console.error(err);
             });
+        },
+
+        _handleSaveErrors: function(error) {
+            var errorJson = JSON.parse(error.responseText);
+            var message = "";
+            array.forEach(errorJson.errors, function (errorObj) {
+                for (prop in errorObj) {
+                    message += "-<em>";
+                    message += prop;
+                    message += "</em>: ";
+                    message += errorObj[prop];
+                    message += "<br>";
+                }
+            });
+            topic.publish('dGrowl', message, {'title': errorJson.message, 'sticky': true, 'channel':'error'});
         }
 
 

diff --git a/atramhasis/static/admin/src/app/ConceptForm.js b/atramhasis/static/admin/src/app/ConceptForm.js
@@ -153,11 +153,6 @@ define(
                         console.log(formObj);
                         topic.publish("conceptform.submit", formObj);
                     }
-                    this.show({
-                        spinnerNode: true,
-                        formNode: false,
-                        successNode: false
-                    });
                     this.dialog && this.dialog.layout();
 
                     return false;
@@ -229,11 +224,6 @@ define(
                             this.matchesManager.setMatchUris(concept.matches);
                         }
                     }
-                    this.show({
-                        spinnerNode: false,
-                        formNode: true,
-                        successNode: false
-                    });
                     this.dialog && this.dialog.layout();
                 },
                 addBroader: function (broader) {

diff --git a/atramhasis/static/admin/src/app/resources/App.css b/atramhasis/static/admin/src/app/resources/App.css
@@ -2,6 +2,7 @@
 @import '../../dijit/themes/claro/claro.css';
 @import '../../dgrid/css/dgrid.css';
 @import '../../dgrid/css/skins/claro.css';
+@import '../../dGrowl/dGrowl.css';
 
 @import 'FilteredGrid.css';
 @import 'ConceptForm.css';
@@ -66,3 +67,9 @@ html, body {
     width: 11px;
     height: 11px;
 }
+
+.dGrowl-channel-warn .dGrowl-notification {
+	background-color: rgb(250, 217, 95);
+    border: 1px solid #b97422;
+}
+
diff --git a/atramhasis/static/admin/src/dojoConfig.js b/atramhasis/static/admin/src/dojoConfig.js
@@ -11,6 +11,7 @@ var dojoConfig = {
 		'put-selector',
 		'xstyle',
 		'dgrid',
-		'app'
+		'app',
+        'dGrowl'
 	]
 };