Merge lp:~benji/juju-gui/go-resolved into lp:juju-gui/experimental

[Benji York]

Support resolving errors on the Go back-end.

https://codereview.appspot.com/8797043/

[Madison Scott-Clary (makyo)]

LGTM - thanks for the branch.

https://codereview.appspot.com/8797043/diff/1/app/store/env/go.js
File app/store/env/go.js (right):

https://codereview.appspot.com/8797043/diff/1/app/store/env/go.js#newcode896
app/store/env/go.js:896: err: !!data.Error,
I know that we usually check if (data.err) in code, but the Error
received is usually a string, correct? If so, we may want to either
leave it as such or make a note for future reference if this winds up in
the notifications list or something.

https://codereview.appspot.com/8797043/

[lp:~benji/juju-gui/go-resolved]

555. By Benji York on 2013-04-16

fix error noted in review

[Gary Poster (gary)]

LGTM. Thank you!

Gary

https://codereview.appspot.com/8797043/diff/6001/app/store/env/go.js
File app/store/env/go.js (right):

https://codereview.appspot.com/8797043/diff/6001/app/store/env/go.js#newcode872
app/store/env/go.js:872: Retry: !!retry
Javascript, you so funny.

https://codereview.appspot.com/8797043/

=== modified file 'app/store/env/go.js'
--- app/store/env/go.js	2013-04-15 12:24:16 +0000
+++ app/store/env/go.js	2013-04-16 14:42:29 +0000
@@ -194,7 +194,9 @@
       // change in delta events based on the deltas we got.
       var deltas = [];
       data.Response.Deltas.forEach(function(delta) {
-        var kind = delta[0], operation = delta[1], entityInfo = delta[2];
+        var kind = delta[0],
+            operation = delta[1],
+            entityInfo = delta[2];
         deltas.push([kind + 'Info', operation, entityInfo]);
       });
       this.fire('delta', {data: {result: deltas}});
@@ -385,7 +387,7 @@
     add_unit: function(service, numUnits, callback) {
       var intermediateCallback;
       if (callback) {
-        // Curry the callback, service and numUnits.  No context is passed.
+        // Capture the callback, service and numUnits.  No context is passed.
         intermediateCallback = Y.bind(this.handleAddUnit, null,
             callback, service, numUnits);
       }
@@ -438,7 +440,7 @@
     remove_units: function(unit_names, callback) {
       var intermediateCallback;
       if (callback) {
-        // Curry the callback and unit_names.  No context is passed.
+        // Capture the callback and unit_names.  No context is passed.
         intermediateCallback = Y.bind(this.handleRemoveUnits, null,
             callback, unit_names);
       }
@@ -485,7 +487,7 @@
     expose: function(service, callback) {
       var intermediateCallback;
       if (callback) {
-        // Curry the callback and service.  No context is passed.
+        // Capture the callback and service.  No context is passed.
         intermediateCallback = Y.bind(this.handleServiceCalls, null,
             callback, service);
       }
@@ -511,7 +513,7 @@
     unexpose: function(service, callback) {
       var intermediateCallback;
       if (callback) {
-        // Curry the callback and service.  No context is passed.
+        // Capture the callback and service.  No context is passed.
         intermediateCallback = Y.bind(
             this.handleServiceCalls, null, callback, service);
       }
@@ -558,7 +560,7 @@
     update_annotations: function(entity, type, data, callback) {
       var intermediateCallback;
       if (callback) {
-        // Curry the callback and entity.  No context is passed.
+        // Capture the callback and entity.  No context is passed.
         intermediateCallback = Y.bind(this.handleSetAnnotations, null,
             callback, entity);
       }
@@ -587,7 +589,7 @@
     remove_annotations: function(entity, type, keys, callback) {
       var intermediateCallback;
       if (callback) {
-        // Curry the callback and entity.  No context is passed.
+        // Capture the callback and entity.  No context is passed.
         intermediateCallback = Y.bind(this.handleSetAnnotations, null,
             callback, entity);
       }
@@ -637,7 +639,7 @@
     get_annotations: function(entity, type, callback) {
       var intermediateCallback;
       if (callback) {
-        // Curry the callback and entity.  No context is passed.
+        // Capture the callback and entity.  No context is passed.
         intermediateCallback = Y.bind(this.handleGetAnnotations, null,
             callback, entity);
       }
@@ -685,7 +687,7 @@
     get_service: function(serviceName, callback) {
       var intermediateCallback;
       if (callback) {
-        // Curry the callback and serviceName.  No context is passed.
+        // Capture the callback and serviceName.  No context is passed.
         intermediateCallback = Y.bind(this.handleGetService, null,
             callback, serviceName);
       }
@@ -742,7 +744,7 @@
     set_config: function(serviceName, config, data, callback) {
       var intermediateCallback, sendData;
       if (callback) {
-        // Curry the callback and serviceName.  No context is passed.
+        // Capture the callback and serviceName.  No context is passed.
         intermediateCallback = Y.bind(this.handleServiceCalls, null,
             callback, serviceName);
       }
@@ -774,7 +776,7 @@
     destroy_service: function(service, callback) {
       var intermediateCallback;
       if (callback) {
-        // Curry the callback and service.  No context is passed.
+        // Capture the callback and service.  No context is passed.
         intermediateCallback = Y.bind(this.handleServiceCalls, null,
             callback, service);
       }
@@ -801,7 +803,7 @@
     set_constraints: function(serviceName, constraints, callback) {
       var intermediateCallback, sendData;
       if (callback) {
-        // Curry the callback and serviceName.  No context is passed.
+        // Capture the callback and serviceName.  No context is passed.
         intermediateCallback = Y.bind(this.handleSetConstraints, null,
             callback, serviceName);
       }
@@ -843,6 +845,60 @@
     },
 
     /**
+      Mark the given unit or relation problem as resolved.
+
+      @method resolved
+      @param {String} unitName The unit name.
+      @param {String} relationName The relation name (ignored).
+      @param {Boolean} retry Whether or not to retry the unit/relation.
+      @param {Function} callback A callable that must be called once the
+        operation is performed.
+      @return {undefined} Sends a message to the server only.
+    */
+    resolved: function(unitName, relationName, retry, callback) {
+      // Resolving a unit/relation pair is not supported by the Go back-end, so
+      // relationName is ignored here.
+      var intermediateCallback, sendData;
+      if (callback) {
+        // Capture the callback and relationName.  No context is passed.
+        intermediateCallback = Y.bind(this.handleResolved, null, callback,
+            unitName);
+      }
+      sendData = {
+        Type: 'Client',
+        Request: 'Resolved',
+        Params: {
+          UnitName: unitName,
+          Retry: !!retry
+        }
+      };
+      this._send_rpc(sendData, intermediateCallback);
+    },
+
+    /**
+      Transform the data returned from juju-core call to Resolved into that
+      suitable for the user callback.
+
+      @method handleResolved
+      @static
+      @param {Function} userCallback The callback originally submitted by the
+        call site.
+      @param {String} unitName The name of the unit.  Passed in since it is not
+        part of the response.
+      @param {Object} data The response returned by the server.
+      @return {undefined} Nothing.
+    */
+    handleResolved: function(userCallback, unitName, data) {
+      // Translate the callback data and call the user's callback.
+      console.log(userCallback);
+      userCallback({
+        op: 'resolved',
+        err: data.Error,
+        unit_name: unitName
+      });
+    },
+
+    /**
        Add a relation between two services.
 
        @method add_relation
@@ -933,7 +989,7 @@
       var endpoint_b = endpointToName(endpointB);
       var intermediateCallback;
       if (callback) {
-        // Curry the endpoints.  No context is passed.
+        // Capture the endpoints.  No context is passed.
         intermediateCallback = Y.bind(this.handleRemoveRelation, null,
                                       callback, endpoint_a, endpoint_b);
       }
@@ -984,7 +1040,7 @@
       // callback is not provided, we can leave intermediateCallback undefined.
       var intermediateCallback;
       if (callback) {
-        // Curry the callback and service.  No context is passed.
+        // Capture the callback and service.  No context is passed.
         intermediateCallback = Y.bind(this.handleCharmInfo, null, callback);
       }
       this._send_rpc({

=== modified file 'test/test_env_go.js'
--- test/test_env_go.js	2013-04-12 20:49:24 +0000
+++ test/test_env_go.js	2013-04-16 14:42:29 +0000
@@ -1181,6 +1181,41 @@
       assert.equal(subscribers[0].args, null);
     });
 
+    it('can resolve a problem with a unit', function() {
+      var unit_name = 'mysql/0';
+      env.resolved(unit_name);
+      msg = conn.last_message();
+      assert.equal(msg.Type, 'Client');
+      assert.equal(msg.Request, 'Resolved');
+      assert.equal(msg.Params.UnitName, 'mysql/0');
+      assert.isFalse(msg.Params.Retry);
+    });
+
+    it('can retry a problem with a unit', function() {
+      var unit_name = 'mysql/0';
+      env.resolved(unit_name, null, true);
+      msg = conn.last_message();
+      assert.equal(msg.Type, 'Client');
+      assert.equal(msg.Request, 'Resolved');
+      assert.equal(msg.Params.UnitName, 'mysql/0');
+      assert.isTrue(msg.Params.Retry);
+    });
+
+    it('can provide a callback', function(done) {
+      var unit_name = 'mysql/0';
+      env.resolved(unit_name, null, true, function(result) {
+        assert.equal(result.op, 'resolved');
+        assert.equal(result.err, 'badness');
+        done();
+      });
+      msg = conn.last_message();
+      env.dispatch_result({
+        RequestId: msg.RequestId,
+        Error: 'badness',
+        Response: {}
+      });
+    });
+
   });
 
 })();