Fix charm deployment from browser in GUI.

Fix charm deployment from browser in GUI.

Spurred by problems in deploying the Discourse charm by Marco Ceppi
<http://jujucharms.com/~marcoceppi/precise/discourse>, get the charm
id from the charm URL for the browser model. The problem arises in
translation between the two different model code paths we have
currently. Thanks to Matt and Rick for the help.

https://code.launchpad.net/~teknico/juju-gui/fix-charm-deploy/+merge/174244

(do not edit description out of merge proposal)

[teknico, 2013-07-11 16:43:08]

Please take a look.

[rharding, 2013-07-11 16:55:49]

Comments below. 

I think we should change the urls to be cs: and add a test to make sure they're
transformed as expected? 

I also think we can get rid of the 'for future reference' as we don't need it in
these cases.

https://codereview.appspot.com/10888048/diff/1/app/widgets/charm-token.js
File app/widgets/charm-token.js (right):

https://codereview.appspot.com/10888048/diff/1/app/widgets/charm-token.js#new...
app/widgets/charm-token.js:161: // Set the id as the browser model expects it.
Can we re-word this? The BrowserCharm model doesn't exist the id to be the url.
It's the Charm model. Maybe this can be "adjust the id to meet Charm model
expectations" or something.

https://codereview.appspot.com/10888048/diff/1/test/test_browser_charm_detail...
File test/test_browser_charm_details.js (right):

https://codereview.appspot.com/10888048/diff/1/test/test_browser_charm_detail...
test/test_browser_charm_details.js:228: url: 'precise/ceph-9',
can this be a cs: url to distinguish why this is here?

https://codereview.appspot.com/10888048/diff/1/test/test_charm_token_drag_and...
File test/test_charm_token_drag_and_drop.js (right):

https://codereview.appspot.com/10888048/diff/1/test/test_charm_token_drag_and...
test/test_charm_token_drag_and_drop.js:69: url: 'test',
again, can this be a url?

[teknico, 2013-07-11 17:16:01]

Thank you. I removed the "For future use" vars, and will add tests for the
changes.

https://codereview.appspot.com/10888048/diff/1/app/widgets/charm-token.js
File app/widgets/charm-token.js (right):

https://codereview.appspot.com/10888048/diff/1/app/widgets/charm-token.js#new...
app/widgets/charm-token.js:161: // Set the id as the browser model expects it.
rharding wrote:
> Can we re-word this? The BrowserCharm model doesn't exist the id
> to be the url. It's the Charm model. Maybe this can be "adjust
> the id to meet Charm model expectations" or something.

Indeed, done.

https://codereview.appspot.com/10888048/diff/1/test/test_browser_charm_detail...
File test/test_browser_charm_details.js (right):

https://codereview.appspot.com/10888048/diff/1/test/test_browser_charm_detail...
test/test_browser_charm_details.js:228: url: 'precise/ceph-9',
rharding wrote:
> can this be a cs: url to distinguish why this is here?

Yep, done.

https://codereview.appspot.com/10888048/diff/1/test/test_charm_token_drag_and...
File test/test_charm_token_drag_and_drop.js (right):

https://codereview.appspot.com/10888048/diff/1/test/test_charm_token_drag_and...
test/test_charm_token_drag_and_drop.js:69: url: 'test',
rharding wrote:
> again, can this be a url?

Is "cs:test" a valid URL?

[rharding, 2013-07-11 17:22:06]

https://codereview.appspot.com/10888048/diff/1/test/test_charm_token_drag_and...
File test/test_charm_token_drag_and_drop.js (right):

https://codereview.appspot.com/10888048/diff/1/test/test_charm_token_drag_and...
test/test_charm_token_drag_and_drop.js:69: url: 'test',
On 2013/07/11 17:16:01, teknico wrote:
> rharding wrote:
> > again, can this be a url?
> 
> Is "cs:test" a valid URL?

It's not technically a valid url, but I think it's enough for this test case
distinguish the id field from the url field in case of any debugging/etc.

[teknico, 2013-07-11 17:58:48]

Please take a look.

[rharding, 2013-07-11 18:02:49]

LGTM thanks for the test changes/fixes. Much nicer.

[gary.poster, 2013-07-11 18:13:08]

LGTM.  Thank you!

Gary

[teknico, 2013-07-11 19:08:10]

*** Submitted:

Fix charm deployment from browser in GUI.

Spurred by problems in deploying the Discourse charm by Marco Ceppi
<http://jujucharms.com/~marcoceppi/precise/discourse>, get the charm
id from the charm URL for the browser model. The problem arises in
translation between the two different model code paths we have
currently. Thanks to Matt and Rick for the help.

R=rharding, gary.poster
CC=
https://codereview.appspot.com/10888048