Merge pull request #5 from burtonjc/master

limscoder · limscoder · commit 728c6bb61af0 · 2013-06-03T09:48:45.000-07:00
Adding ability to choose from your organizations and view their repos.
diff --git a/changeset/data/github/Adapter.js b/changeset/data/github/Adapter.js
@@ -45,7 +45,7 @@ Ext.define('changeset.data.github.Adapter', {
      * Base url for all Github api requests.
      */
     apiUrl: 'https://api.github.com',
-    
+
     /**
      * @cfg {Int}
      * Page size to use for api calls.
@@ -58,7 +58,7 @@ Ext.define('changeset.data.github.Adapter', {
 
     constructor: function(config) {
         Ext.apply(this, config);
-        
+
         var urlParts = window.location.href.split('?');
         this.stateId = 'githubAdapter-' + urlParts[0];
         if (urlParts.length > 1) {
@@ -105,6 +105,7 @@ Ext.define('changeset.data.github.Adapter', {
             username: this.username,
             authToken: this.authToken,
             repository: this.repository,
+            organization: this.organization,
             branch: this.branch
         };
     },
@@ -117,6 +118,14 @@ Ext.define('changeset.data.github.Adapter', {
         return 'Login to your GitHub account';
     },
 
+    /**
+     * Get the currently logged in user's username
+     * @return {String}
+     */
+    getUserName: function() {
+        return this.username;
+    },
+
     /**
      * Return a url to the repository.
      * @return {String}
@@ -138,13 +147,34 @@ Ext.define('changeset.data.github.Adapter', {
      * @param {changeset.model.Repository}
      */
     setRepository: function(repository) {
-        if( !this.repository || this.repository.name !== repository.raw.name ) {
+        if( !this.repository || this.repository.name !== repository.get('name') ) {
             this.branch = null;
         }
         this.repository = repository.raw;
         this.fireEvent('statechange', this);
     },
 
+    /*
+     * Gets the currently selected organization.
+     * @return {Object}
+     */
+    getOrganization: function() {
+        return this.organization;
+    },
+
+    /*
+     * Set the repository to fetch data from.
+     * @param {changeset.model.Repository}
+     */
+    setOrganization: function(organization) {
+        if (!this.organization || this.organization.login !== organization.get('login')) {
+            this.repository = null;
+            this.branch = null;
+        }
+        this.organization = organization.raw || organization.data;
+        this.fireEvent('statechange', this);
+    },
+
     /*
      * Gets the currently selected branch.
      * @return {Object}
@@ -163,19 +193,20 @@ Ext.define('changeset.data.github.Adapter', {
     },
 
     /**
-     * Constructs a store which populates repository models.
+     * Constructs a store which populates organization models.
      * @param {Function} callback Function to call after store is created.
      * @param {Object} scope Scope to execute callback with.
      */
-    getRepositoryStore: function(callback, scope) {
+    getOrganizationStore: function(callback, scope) {
         var url = [
             this.apiUrl,
-            'user',
-            'repos'
+            'users',
+            this.username,
+            'orgs'
         ].join('/');
 
         var store = Ext.create('Ext.data.Store', {
-            model: 'changeset.model.Repository',
+            model: 'changeset.model.Organization',
             proxy: Ext.create('changeset.data.github.Proxy', {
                 url: url
             })
@@ -184,6 +215,60 @@ Ext.define('changeset.data.github.Adapter', {
         callback.call(scope, store);
     },
 
+    /**
+     * Constructs a store which populates repository models.
+     * @param {Function} callback Function to call after store is created.
+     * @param {Object} scope Scope to execute callback with.
+     */
+    getRepositoryStore: function(callback, scope) {
+        var url = [this.apiUrl];
+
+        if (this.organization.url) {
+            url = url.concat([
+                'orgs',
+                this.organization.login,
+                'repos'
+            ]);
+        } else {
+            url = url.concat([
+                'user',
+                'repos'
+            ]);
+        }
+
+        var store = Ext.create('Ext.data.Store', {
+            model: 'changeset.model.Repository',
+            proxy: Ext.create('changeset.data.github.Proxy', {
+                url: url.join('/')
+            }),
+            buffered: true,
+            pageSize: this.pageSize,
+            listeners: {
+                load: {
+                    fn: function(store, records, successful, eOpts) {
+                        if (successful && records.length === store.pageSize) {
+                            store.prefetchPage(store.currentPage + 1);
+                            return false;
+                        }
+                    },
+                    single: true
+                },
+                prefetch: function(store, records, successful, operation, eOpts) {
+                    if (successful) {
+                        store.add(records);
+                        if (records.length === store.pageSize) {
+                            store.prefetchPage(store.currentPage + 1);
+                        } else {
+                            store.fireEvent('load');
+                        }
+                    }
+                }
+            }
+        });
+
+        callback.call(scope, store);
+    },
+
     /**
      * Constructs a store which populates branch models.
      * @param {Function} callback Function to call after store is created.
@@ -282,7 +367,7 @@ Ext.define('changeset.data.github.Adapter', {
                 }
             })
         });
-        
+
         callback.call(scope, store);
     },
 
@@ -333,7 +418,7 @@ Ext.define('changeset.data.github.Adapter', {
      * @param {String} password Password to login with.
      */
     authenticate: function(username, password) {
-        this.username = username;
+        this.username = username;               
 
         Ext.Ajax.request({
             url: this.apiUrl + '/authorizations',
@@ -368,6 +453,7 @@ Ext.define('changeset.data.github.Adapter', {
      */
     logout: function() {
         this.repository = null;
+        this.organization = null;
         this.branch = null;
         this.username = null;
         this.authToken = null;
@@ -420,7 +506,7 @@ Ext.define('changeset.data.github.Adapter', {
         }
     },
 
-    _onBeforeAjaxRequest: function(ext, opts) {
+    _onBeforeAjaxRequest: function(ext, opts) { 
         if (Ext.isEmpty(opts.headers)) {
             opts.headers = {};
         }
diff --git a/changeset/data/github/CommitStore.js b/changeset/data/github/CommitStore.js
@@ -10,6 +10,13 @@ Ext.define('changeset.data.github.CommitStore', {
 
     model: 'changeset.model.Commit',
 
+    constructor: function() {
+        this.callParent(arguments);
+        this.on('beforeload', function(store, operation, eOpts) {
+            this._addShaToOptions(1);
+        }, this, {single:true});
+    },
+
     /**
      * Github's commit endpoint's paging is a little funky.
      *
diff --git a/changeset/model/Organization.js b/changeset/model/Organization.js
@@ -0,0 +1,8 @@
+Ext.define('changeset.model.Organization', {
+    extend: 'Ext.data.Model',
+    idProperty: 'login',
+    fields: [
+        {name: 'url', type: 'string'},
+        {name: 'login', type: 'string'}
+    ]
+});
diff --git a/changeset/ui/ChangesetBrowser.js b/changeset/ui/ChangesetBrowser.js
@@ -56,39 +56,62 @@ Ext.define('changeset.ui.ChangesetBrowser', {
                 }]
         });
 
-        this._addRepoChooser();
+        this._addOrganizationChooser();
     },
 
-    _addFilter: function() {
-        if (this.down('changesetfilter')) {
-            return;
-        }
+    _addOrganizationChooser: function() {
+        var toolbar = this.down('#topToolbar'),
+            valueField = 'login';
 
-        var toolbar = this.down('#topToolbar');
-        var filter = toolbar.insert(4, {
-            xtype: 'changesetfilter',
-            width: 210,
-            listeners: {
-                filter: this._onFilter,
-                afterrender: function(cmp) {
-                    var tip = Ext.create('Rally.ui.tooltip.ToolTip', {
-                        target: cmp.getEl(),
-                        anchor: 'right',
-                        hideDelay: 0,
-                        html: 'Filter commits by: <br /> <ul><li>-- message</li><li>-- author</li><li>-- revision</li></ul>'
-                    });
-                },
-                scope: this
-            }
-        });
+        this.adapter.getOrganizationStore(function(store) {
+            var combo = toolbar.insert(2, {
+                xtype: 'rallycombobox',
+                margin: '0 5 0 0',
+                store: store,
+                fieldLabel: 'Org:',
+                labelWidth: 30,
+                displayField: valueField,
+                // allowNoEntry: true,
+                // noEntryText: this.adapter.getUserName(),
+                listeners: {
+                    beforeselect: function(combo, record) {
+                        if (record && record.get('login') !== this.adapter.getOrganization().login) {
+                            this._onOrganizationSelect(record);
+                        }
+                    },
+                    scope: this
+                }
+            });
+
+            store.on('load', function() {
+                store.insert(0, [{login: this.adapter.getUserName(), url: null}]);
+                var org = this.adapter.getOrganization(),
+                    selectedOrg = org ? store.findRecord('login', org.login) : store.getAt(0);
+                combo.select(selectedOrg);
+                this._onOrganizationSelect(selectedOrg);
+            }, this, {single: true});
+            store.load();
+        }, this);
+    },
+
+    _onOrganizationSelect: function(organization) {
+        this.adapter.setOrganization(organization);
+        this.removeAll();
+        this._addRepoChooser();
     },
 
     _addRepoChooser: function() {
-        var toolbar = this.down('#topToolbar');
-        var valueField = 'name';
+        var toolbar = this.down('#topToolbar'),
+            valueField = 'name',
+            combo = toolbar.down('#repoChooser');
+        if (combo) {
+            toolbar.remove(combo);
+        }
+
         this.adapter.getRepositoryStore(function(store) {
-            var combo = toolbar.insert(2, {
+            var combo = toolbar.insert(3, {
                 xtype: 'rallycombobox',
+                itemId: 'repoChooser',
                 margin: '0 5 0 0',
                 store: store,
                 fieldLabel: 'Repo:',
@@ -107,9 +130,12 @@ Ext.define('changeset.ui.ChangesetBrowser', {
             store.on('load', function() {
                 var repo = this.adapter.getRepository();
                 var selectedRepo = repo ? store.findRecord('name', repo.name) : store.getAt(0);
-                combo.select(selectedRepo);
-                this._onRepositorySelect(selectedRepo);
+                if (selectedRepo) {
+                    combo.select(selectedRepo);
+                    this._onRepositorySelect(selectedRepo);
+                }
             }, this, {single: true});
+
             store.load();
         }, this);
     },
@@ -129,7 +155,7 @@ Ext.define('changeset.ui.ChangesetBrowser', {
 
         var valueField = 'name';
         this.adapter.getBranchStore(function(store) {
-            combo = toolbar.insert(3, {
+            combo = toolbar.insert(4, {
                 xtype: 'rallycombobox',
                 itemId: 'branchChooser',
                 margin: '0 5 0 0',
@@ -148,8 +174,11 @@ Ext.define('changeset.ui.ChangesetBrowser', {
             });
 
             store.on('load', function() {
-                var branch = this.adapter.getBranch();
-                var selectedBranch = branch ? store.findRecord('name', branch.name) : store.getAt(0);
+                var currentBranch = this.adapter.getBranch(),
+                    branchName = currentBranch ? currentBranch.name : 'master',
+                    selectedBranch = store.findRecord('name', branchName);
+                selectedBranch = selectedBranch || store.getAt(0);
+
                 combo.select(selectedBranch);
                 this._onBranchSelect(selectedBranch);
             }, this, {single: true});
@@ -164,6 +193,30 @@ Ext.define('changeset.ui.ChangesetBrowser', {
         this._addGrid();
     },
 
+    _addFilter: function() {
+        if (this.down('changesetfilter')) {
+            return;
+        }
+
+        var toolbar = this.down('#topToolbar');
+        var filter = toolbar.insert(5, {
+            xtype: 'changesetfilter',
+            width: 210,
+            listeners: {
+                filter: this._onFilter,
+                afterrender: function(cmp) {
+                    var tip = Ext.create('Rally.ui.tooltip.ToolTip', {
+                        target: cmp.getEl(),
+                        anchor: 'right',
+                        hideDelay: 0,
+                        html: 'Filter commits by: <br /> <ul><li>-- message</li><li>-- author</li><li>-- revision</li></ul>'
+                    });
+                },
+                scope: this
+            }
+        });
+    },
+
     _addGrid: function() {
         var callback = function(store) {
             var grid = this.add({
diff --git a/config.json b/config.json
@@ -9,6 +9,7 @@
         "changeset/model/Comment.js",
         "changeset/model/Commit.js",
         "changeset/model/ChangesetFile.js",
+        "changeset/model/Organization.js",
         "changeset/model/Repository.js",
 
         "changeset/data/CommentLocator.js",
diff --git a/deploy/App.html b/deploy/App.html
