/juju-gui

Collection of tasks to move the GUI towards apiv4 #703

Merged
merged 4 commits into from Mar 11, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@hatched @jujugui @jaycee @kadams54
@hatched
Owner

hatched commented Mar 10, 2015

This branch contains 4 separate tasks to move the GUI away from apiv3 and to apiv4.

Completed:

  • charmbrowser.js updates
  • charm-details.js updates
  • charmresults.js updates
  • charm.js updates
@hatched
Owner

hatched commented Mar 10, 2015

To QA

Open and close the charm details pane, navigate around them, change tabs, switch charms, etc. It should all work as expected
app/models/charm.js
@@ -27,8 +27,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
YUI.add('juju-charm-models', function(Y) {
- var RECENT_DAYS = 30;
@hatched

hatched Mar 10, 2015

Owner

Because of the format of the new api data the recentcommits code is no longer necessary

app/store/charmstore-api.js
- filters = '';
- }
+ var filters = 'include=bundle-metadata&include=charm-metadata' +
+ '&include=charm-config&include=manifest&include=extra-info';
@hatched

hatched Mar 10, 2015

Owner

consolidating these together is the first step in making the GUI support bundle and charms in the same namespace. (future)

test/data/browsercharm.json
@@ -1,352 +1,455 @@
{
- "charm": {
@hatched

hatched Mar 10, 2015

Owner

This is changing the test json data into the apiv4 processed data format - you can skip this file.

@jujugui
Member

jujugui commented Mar 10, 2015

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
http://ci.jujugui.org:8080//job/juju-gui/2400/
Test FAILed.
@hatched
Owner

hatched commented Mar 10, 2015

Spurious failure
app/subapps/browser/views/charm.js
+ this.get('charmstore').getEntity(
+ this.get('entityId'),
+ function(charms) {
+ var charm = charms[0];
@jaycee

jaycee Mar 10, 2015

Member

I'm a little confused on what you're getting back on getEntity and how we know we always just want the first one.

@hatched

hatched Mar 10, 2015

Owner

The data returned from getEntity goes through a few transform methods, one of them handles transforming objects into the Charm models. Because this method is used in many different places it returns an array of items. In this case though we know for sure that we are only going to get a single response back from the api so that's why I'm grabbing the first one.

@jaycee

jaycee Mar 10, 2015

Member

Ah, thanks.

@kadams54

kadams54 Mar 10, 2015

Contributor

Maybe a comment to that effect in the code?

@jaycee
Member

jaycee commented Mar 10, 2015

👍 thanks @hatched.
@kadams54
Contributor

kadams54 commented Mar 10, 2015

👍 with trivial, QA is 🆗, thanks!
@hatched
Owner

hatched commented Mar 10, 2015

Thanks a lot for the qa's and reviews guys! :shipit:
@jujugui
Member

jujugui commented Mar 10, 2015

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
http://ci.jujugui.org:8080//job/juju-gui/2404/
Test FAILed.
@jujugui
Member

jujugui commented Mar 11, 2015

Status: merge request accepted. Url: http://ci.jujugui.org:8080/job/juju-gui-merge

jujugui added a commit that referenced this pull request Mar 11, 2015

@jujugui
Merge pull request #703 from hatched/apiv3-4-collection 
Collection of tasks to move the GUI towards apiv4

This branch contains 4 separate tasks to move the GUI away from apiv3 and to apiv4.

Completed:
- charmbrowser.js updates
- charm-details.js updates
- charmresults.js updates
- charm.js updates
9514b97

@jujugui jujugui merged commit 9514b97 into juju:develop Mar 11, 2015
1 check failed

1 check failed

default Merged build finished.
Details

@hatched hatched deleted the hatched:apiv3-4-collection branch Mar 31, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment