Complete changes simulating zero client-server-db latency

airandfingers · airandfingers · commit fa934315f575 · 2014-09-17T13:50:11.000-07:00
Fix a missed error message that wasn't going through $rootScope.onError
Remove some noisy console.log statements
diff --git a/apps/trolls_goals/public/js/areas.js b/apps/trolls_goals/public/js/areas.js
@@ -34,24 +34,29 @@ areasModule.factory('AreaFactory', function($resource, $rootScope) {
       });
     }
     else {
+      $rootScope.areas.push(area);
+      $rootScope.calculateDomainAreaMap();
       Area.save(area, function(a) {
         console.log('successfully added area!', a);
-        $rootScope.areas.push(a);
+        area._id = a._id;
         $rootScope.records[a._id] = {};
-        $rootScope.calculateDomainAreaMap();
       }, function(response) {
         $rootScope.onError('creating an area', response.data.error);
+        $rootScope.areas = _.without($rootScope.areas, area);
+        $rootScope.calculateDomainAreaMap();
       });
     }
     $rootScope.newArea();
   };
 
   $rootScope.deleteArea = function(area) {
+    $rootScope.handleDeletedArea(area, true);
     area.$delete({ id: area._id }, function(success) {
       console.log('successfully deleted area!', area);
-      $rootScope.handleDeletedArea(area, true);
     }, function(response) {
       $rootScope.onError('deleting an area', response.data.error);
+      $rootScope.areas.push(area);
+      $rootScope.calculateDomainAreaMap();
     });
   };
 
@@ -60,17 +65,20 @@ areasModule.factory('AreaFactory', function($resource, $rootScope) {
       return _area.name === area.name;
     });
     if (recalculate) { $rootScope.calculateDomainAreaMap(); }
-  }
+  };
+
+  $rootScope.handleAddedArea = function(area, recalculate) {
+    $rootScope.areas.push(area);
+    if (recalculate) { $rootScope.calculateDomainAreaMap(); }
+  };
 
   var Area = $resource('/api/area/:id', null,
                            { query: { method: 'GET', isArray: true, cache: true }
                            , update: { method: 'PUT' } }
   );
   Area.list = function(cb) {
-    console.log('Area.list called');
     if (_.isUndefined($rootScope.areas)) {
       Area.query(function(areas) {
-        console.log('Area.list cb');
         $rootScope.areas = areas;
         if (_.isFunction(cb)) { cb(); }
       }, function(response) {
diff --git a/apps/trolls_goals/public/js/crud_tooltip.js b/apps/trolls_goals/public/js/crud_tooltip.js
@@ -371,16 +371,13 @@ angular.module('crudTooltip', [ 'ui.bootstrap.position' ])
     templateUrl: function(tElem, tAttrs) { return template_map[tAttrs.templateUrl]; },
     link: function (scope, element, attrs) {
       //console.log('link called with', scope, element, attrs);
-      scope.closePopup = function() {
+      scope.closePopup = function($event) {
         var trigger = element.prev();
         $timeout(function() {
           trigger.triggerHandler('click');
         });
-      }
-
-      element.bind('click', function($event) {
         $event.stopPropagation();
-      });
+      }
     }
   };
 })
diff --git a/apps/trolls_goals/public/js/domains.js b/apps/trolls_goals/public/js/domains.js
@@ -44,40 +44,51 @@ domainsModule.factory('DomainFactory', function($resource, $rootScope) {
       });
     }
     else {
-      Domain.save(domain, function(d) {
+      var domain_copy = _.clone(domain);
+      domain._id = 'ffffffffffffffffffffffff'; // create a temporary ID
+      $rootScope.domains.push(domain);
+      $rootScope.calculateDomainAreaMap();
+      Domain.save(domain_copy, function(d) {
         console.log('successfully added domain!', d);
-        $rootScope.domains.push(d);
+        domain._id = d._id;
         $rootScope.calculateDomainAreaMap();
       }, function(response) {
         $rootScope.onError('creating a domain', response.data.error);
+        $rootScope.domains = _.without($rootScope.domains, domain);
+        $rootScope.calculateDomainAreaMap();
       });
     }
     $rootScope.newDomain();
   };
 
   $rootScope.deleteDomain = function(domain) {
+    var deleted_areas = [];
+    $rootScope.domains = _.reject($rootScope.domains, function(_domain) {
+      return _domain.name === domain.name;
+    });
+    _.each($rootScope.domain_area_map[domain._id], function(area) {
+      deleted_areas.push(area);
+      $rootScope.handleDeletedArea(area, false);
+    });
+    $rootScope.calculateDomainAreaMap();
     domain.$delete({ id: domain._id }, function(success) {
       console.log('successfully deleted domain!', domain);
-      $rootScope.domains = _.reject($rootScope.domains, function(_domain) {
-        return _domain.name === domain.name;
-      });
-      _.each($rootScope.domain_area_map[domain._id], function(area) {
-        $rootScope.handleDeletedArea(area, false);
-      });
-      $rootScope.calculateDomainAreaMap();
     }, function(response) {
       $rootScope.onError('deleting a domain', response.data.error);
+      $rootScope.domains.push(domain);
+      _.each(deleted_areas, function(area) {
+        $rootScope.handleAddedArea(area, false);
+      });
+      $rootScope.calculateDomainAreaMap();
     });
   };
 
   var Domain = $resource('/api/domain/:id', null,
                       { update: { method: 'PUT' } }
   );
   Domain.list = function(cb) {
-    console.log('Domain.list called');
     if (_.isUndefined($rootScope.domains)) {
       Domain.query(function(domains) {
-        console.log('Domain.list cb');
         $rootScope.domains = domains;
         if (_.isFunction(cb)) { cb(); }
       }, function(response) {
diff --git a/apps/trolls_goals/public/js/records.js b/apps/trolls_goals/public/js/records.js
@@ -45,13 +45,15 @@ recordsModule.factory('RecordFactory', function($resource, $rootScope) {
   };
 
   $rootScope.deleteRecord = $rootScope.deleteRecord || function(record) {
+    $rootScope.records[record.area][record.day] = _.reject($rootScope.records[record.area][record.day], function(_record) {
+      return _record._id === record._id;
+    });
     record.$delete({ id: record._id }, function(success) {
       console.log('successfully deleted record!', record);
-      $rootScope.records[record.area][record.day] = _.reject($rootScope.records[record.area][record.day], function(_record) {
-        return _record._id === record._id;
-      });
     }, function(response) {
       $rootScope.onError('deleting a record', response.data.error);
+      // recreate not-actually-deleted record
+      $rootScope.records[record.area][record.day].push(record);
     });
   };
 
diff --git a/apps/trolls_goals/public/js/records_table.js b/apps/trolls_goals/public/js/records_table.js
@@ -30,8 +30,7 @@ recordsTableModule.directive('recordsTable', function($rootScope, RecordFactory)
             }
           });
         }, function(response) {
-          console.error(response.data.error);
-          $rootScope.error = response.data.error;
+          $rootScope.onError('fetching ' + scope.domain.name + ' records', response.data.error);
         });
       });
     }
diff --git a/apps/trolls_goals/public/tmpl/area_tooltip.html b/apps/trolls_goals/public/tmpl/area_tooltip.html
@@ -2,9 +2,9 @@
      ng-init="$root.backupArea(item)">
   <div class="arrow"></div>
   <div class="popover-inner">
-    <div ng-enter="$root.saveArea(item); closePopup();"
-         ng-ctrl-delete="$root.deleteArea(item); closePopup();"
-         ng-escape="$root.revertArea(item); closePopup();">
+    <div ng-enter="$root.saveArea(item); closePopup($event);"
+         ng-ctrl-delete="$root.deleteArea(item); closePopup($event);"
+         ng-escape="$root.revertArea(item); closePopup($event);">
       <div class="input-group" title="Name of this area">
         <span class="input-group-addon bold" focus-next-when-clicked>Name</span>
         <input type="text" class="form-control" ng-model="item.name" focus-on-load />
@@ -35,22 +35,22 @@
       <input type="hidden" ng-model="item.start_day" />
     </div>
     <div class="crud_buttons">
-      <button class="btn btn-primary" ng-click="$root.saveArea(item); closePopup();" title="{{mode}} (Enter)">
+      <button class="btn btn-primary" ng-click="$root.saveArea(item); closePopup($event);" title="{{mode}} (Enter)">
         {{mode}}
         <span class="glyphicon glyphicon-ok"></span>
       </button>
       <button ng-if="mode === 'Update'" class="btn btn-danger"
-              ng-click="$root.deleteArea(item); closePopup();" title="Delete (Ctrl + Delete)">
+              ng-click="$root.deleteArea(item); closePopup($event);" title="Delete (Ctrl + Delete)">
         Delete
         <span class="glyphicon glyphicon-trash"></span>
       </button>
       <button ng-if="mode === 'Update'" class="btn btn-warning float-right"
-              ng-click="$root.revertArea(item); closePopup();" title="Discard Changes (Esc)">
+              ng-click="$root.revertArea(item); closePopup($event);" title="Discard Changes (Esc)">
         Discard
         <span class="glyphicon glyphicon-remove"></span>
       </button>
       <button ng-if="mode !== 'Update'" class="btn btn-warning float-right"
-              ng-click="$root.newArea(); closePopup();" title="Cancel (Esc)">
+              ng-click="$root.newArea(); closePopup($event);" title="Cancel (Esc)">
         Cancel
         <span class="glyphicon glyphicon-remove"></span>
       </button>
diff --git a/apps/trolls_goals/public/tmpl/domain_tooltip.html b/apps/trolls_goals/public/tmpl/domain_tooltip.html
@@ -2,9 +2,9 @@
      ng-init="$root.backupDomain(item)">
   <div class="arrow"></div>
   <div class="popover-inner">
-    <div ng-enter="$root.saveDomain(item); closePopup();"
-         ng-ctrl-delete="$root.deleteDomain(item); closePopup();"
-         ng-escape="$root.revertDomain(item); closePopup();">
+    <div ng-enter="$root.saveDomain(item); closePopup($event);"
+         ng-ctrl-delete="$root.deleteDomain(item); closePopup($event);"
+         ng-escape="$root.revertDomain(item); closePopup($event);">
       <div class="input-group" title="Name of this domain">
         <span class="input-group-addon bold" focus-next-when-clicked>Name</span>
         <input type="text" class="form-control" ng-model="item.name" focus-on-load />
@@ -21,22 +21,22 @@
       </select>
     </div>
     <div class="crud_buttons">
-      <button class="btn btn-primary" ng-click="$root.saveDomain(item); closePopup();" title="{{mode}} (Enter)">
+      <button class="btn btn-primary" ng-click="$root.saveDomain(item); closePopup($event);" title="{{mode}} (Enter)">
         {{mode}}
         <span class="glyphicon glyphicon-ok"></span>
       </button>
       <button ng-if="mode === 'Update'" class="btn btn-danger"
-              ng-click="$root.deleteDomain(item); closePopup();" title="Delete (Ctrl + Delete)">
+              ng-click="$root.deleteDomain(item); closePopup($event);" title="Delete (Ctrl + Delete)">
         Delete
         <span class="glyphicon glyphicon-trash"></span>
       </button>
       <button ng-if="mode === 'Update'" class="btn btn-warning float-right"
-              ng-click="$root.revertDomain(item); closePopup();" title="Discard Changes (Esc)">
+              ng-click="$root.revertDomain(item); closePopup($event);" title="Discard Changes (Esc)">
         Discard
         <span class="glyphicon glyphicon-remove"></span>
       </button>
       <button ng-if="mode !== 'Update'" class="btn btn-warning float-right"
-              ng-click="$root.newDomain(); closePopup();" title="Cancel (Esc)">
+              ng-click="$root.newDomain(); closePopup($event);" title="Cancel (Esc)">
         Cancel
         <span class="glyphicon glyphicon-remove"></span>
       </button>
diff --git a/apps/trolls_goals/public/tmpl/record_tooltip.html b/apps/trolls_goals/public/tmpl/record_tooltip.html
@@ -2,23 +2,23 @@
      ng-init="$root.backupRecord(item)">
   <div class="arrow"></div>
   <div class="popover-inner">
-    <div ng-enter="$root.saveRecord(item); closePopup();"
-         ng-ctrl-delete="$root.deleteRecord(item); closePopup();"
-         ng-escape="$root.revertRecord(item); closePopup();">
+    <div ng-enter="$root.saveRecord(item); closePopup($event);"
+         ng-ctrl-delete="$root.deleteRecord(item); closePopup($event);"
+         ng-escape="$root.revertRecord(item); closePopup($event);">
       <input type="text" placeholder="Details" class="form-control" ng-model="item.details" focus-on-load />
     </div>
     <div class="crud_buttons">
-      <button class="btn btn-primary" ng-click="$root.saveRecord(item); closePopup();" title="{{mode}} (Enter)">
+      <button class="btn btn-primary" ng-click="$root.saveRecord(item); closePopup($event);" title="{{mode}} (Enter)">
         {{mode}}
         <span class="glyphicon glyphicon-ok"></span>
       </button>
       <button class="btn btn-danger" title="Delete (Ctrl + Delete)"
-              ng-click="$root.deleteRecord(item); closePopup();">
+              ng-click="$root.deleteRecord(item); closePopup($event);">
         Delete
         <span class="glyphicon glyphicon-trash"></span>
       </button>
       <button class="btn btn-warning"
-              ng-click="$root.revertRecord(item); closePopup();" title="Discard Changes (Esc)">
+              ng-click="$root.revertRecord(item); closePopup($event);" title="Discard Changes (Esc)">
         Discard
         <span class="glyphicon glyphicon-remove"></span>
       </button>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rpwm-server",
-  "version": "1.0.1-37",
+  "version": "1.0.1-40",
   "private": true,
   "dependencies": {
     "async": "latest",

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ recordsTableModule.directive('recordsTable', function($rootScope, RecordFactory)`
`30`	`30`	`}`
`31`	`31`	`});`
`32`	`32`	`}, function(response) {`
`33`		`- console.error(response.data.error);`
`34`		`- $rootScope.error = response.data.error;`
	`33`	`+ $rootScope.onError('fetching ' + scope.domain.name + ' records', response.data.error);`
`35`	`34`	`});`
`36`	`35`	`});`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rpwm-server",`
`3`		`- "version": "1.0.1-37",`
	`3`	`+ "version": "1.0.1-40",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"async": "latest",`