From caff4dda4644342de6bc002516f2e555ba5b6523 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 5 Aug 2015 11:02:14 +0200 Subject: [PATCH 01/11] Update Ember to 1.13.6 --- bower.json | 6 +++--- package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index 4562f880..8e938bf4 100644 --- a/bower.json +++ b/bower.json @@ -3,16 +3,16 @@ "dependencies": { "handlebars": "2.0.0", "jquery": "^1.11.1", - "ember": "1.13.3", + "ember": "1.13.6", "ember-data": "1.0.0-beta.16.1", "ember-resolver": "~0.1.15", "loader.js": "ember-cli/loader.js#1.0.1", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0", "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", - "ember-qunit": "0.4.0", + "ember-qunit": "0.4.9", "ember-qunit-notifications": "0.0.5", - "qunit": "~1.17.1", + "qunit": "~1.18.0", "visibilityjs": "~1.2.1", "JavaScript-MD5": "~1.1.0", "moment": "~2.9.0", diff --git a/package.json b/package.json index dd69ed6e..14b008e8 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.0.2", "broccoli-sass": "0.6.5", - "ember-cli": "^1.13.1", + "ember-cli": "1.13.7", "ember-cli-app-version": "0.4.0", "ember-cli-autoprefixer": "^0.3.0", "ember-cli-babel": "5.0.0", @@ -35,7 +35,7 @@ "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-inline-images": "^0.0.4", "ember-cli-pretender": "0.3.1", - "ember-cli-qunit": "0.3.15", + "ember-cli-qunit": "0.3.20", "ember-cli-release": "0.2.3", "ember-cli-sauce": "^1.1.0", "ember-cli-uglify": "1.0.1", From 23c51613653c09dff1e7883fe697e6223241e84a Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 5 Aug 2015 11:06:08 +0200 Subject: [PATCH 02/11] Bump brocolli-sass to 0.6.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 14b008e8..ba38bc94 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "broccoli-sass": "0.6.5", + "broccoli-sass": "0.6.6", "ember-cli": "1.13.7", "ember-cli-app-version": "0.4.0", "ember-cli-autoprefixer": "^0.3.0", From 58a817ee8d844da3ed6a5b402bcff36a5e343b98 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 5 Aug 2015 11:07:09 +0200 Subject: [PATCH 03/11] Try 0.12.x node version on heroku --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba38bc94..974b3fbf 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "repository": "", "engines": { - "node": "0.10.32" + "node": "0.12.x" }, "author": "", "license": "MIT", From 759e56d7ba03c3e8d201d9ab6dbbd3f3d99017ee Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 5 Aug 2015 13:11:57 +0200 Subject: [PATCH 04/11] Change repos-list into a component --- app/components/repo-show-tabs.coffee | 54 +++++++++++++ app/components/repos-list-item.coffee | 29 +++++++ app/components/repos-list.coffee | 6 ++ app/controllers/repos.coffee | 13 +-- app/routes/main-tab.coffee | 8 +- app/templates/components/repo-show-tabs.hbs | 83 ++++++++++++++++++++ app/templates/components/repos-list-item.hbs | 35 +++++++++ app/templates/components/repos-list.hbs | 7 ++ app/templates/repo.hbs | 2 +- app/templates/repos.hbs | 45 +---------- app/templates/repos/show/tabs.hbs | 82 ------------------- 11 files changed, 228 insertions(+), 136 deletions(-) create mode 100644 app/components/repo-show-tabs.coffee create mode 100644 app/components/repos-list-item.coffee create mode 100644 app/components/repos-list.coffee create mode 100644 app/templates/components/repo-show-tabs.hbs create mode 100644 app/templates/components/repos-list-item.hbs create mode 100644 app/templates/components/repos-list.hbs diff --git a/app/components/repo-show-tabs.coffee b/app/components/repo-show-tabs.coffee new file mode 100644 index 00000000..aa15b348 --- /dev/null +++ b/app/components/repo-show-tabs.coffee @@ -0,0 +1,54 @@ +`import Ember from 'ember'` + +RepoShowTabsComponent = Ember.Component.extend + # hrm. how to parametrize bind-attr? + classCurrent: (-> + 'active' if @get('tab') == 'current' + ).property('tab') + + classBuilds: (-> + 'active' if @get('tab') == 'builds' + ).property('tab') + + classPullRequests: (-> + 'active' if @get('tab') == 'pull_requests' + ).property('tab') + + classBranches: (-> + 'active' if @get('tab') == 'branches' + ).property('tab') + + classEvents: (-> + 'active' if @get('tab') == 'events' + ).property('tab') + + classBuild: (-> + tab = @get('tab') + classes = [] + classes.push('active') if tab == 'build' + classes.push('display-inline') if tab == 'build' || tab == 'job' + classes.join(' ') + ).property('tab') + + # TODO: refactor tabs, most of the things here are not really DRY + classJob: (-> + 'active' if @get('tab') == 'job' + ).property('tab') + + classRequests: (-> + 'active' if @get('tab') == 'requests' + ).property('tab') + + classCaches: (-> + 'active' if @get('tab') == 'caches' + ).property('tab') + + classSettings: (-> + 'active' if @get('tab') == 'settings' + ).property('tab') + + classRequest: (-> + 'active' if @get('tab') == 'request' + ).property('tab') + +`export default RepoShowTabsComponent` diff --git a/app/components/repos-list-item.coffee b/app/components/repos-list-item.coffee new file mode 100644 index 00000000..1d620188 --- /dev/null +++ b/app/components/repos-list-item.coffee @@ -0,0 +1,29 @@ +`import Ember from 'ember'` +`import Polling from 'travis/mixins/polling'` +`import { colorForState } from 'travis/utils/helpers'` + +ReposListItemComponent = Ember.Component.extend Polling, + tagName: 'li' + + pollModels: 'repo' + + classNames: ['repo'] + classNameBindings: ['color', 'selected'] + selected: (-> + @get('repo') == @get('selectedRepo') + ).property('selectedRepo') + + color: (-> + colorForState(@get('repo.lastBuildState')) + ).property('repo.lastBuildState') + + scrollTop: (-> + if (window.scrollY > 0) + $('html, body').animate({scrollTop: 0}, 200) + ) + + click: -> + @scrollTop() + @get('controller').transitionToRoute('/' + @get('repo.slug')) + +`export default ReposListItemComponent` diff --git a/app/components/repos-list.coffee b/app/components/repos-list.coffee new file mode 100644 index 00000000..3dcf8f8c --- /dev/null +++ b/app/components/repos-list.coffee @@ -0,0 +1,6 @@ +`import Ember from 'ember'` + +ReposListComponent = Ember.Component.extend + tagName: 'ul' + +`export default ReposListComponent` diff --git a/app/controllers/repos.coffee b/app/controllers/repos.coffee index bce174fa..dcf43dda 100644 --- a/app/controllers/repos.coffee +++ b/app/controllers/repos.coffee @@ -2,7 +2,8 @@ `import limit from 'travis/utils/computed-limit'` `import Repo from 'travis/models/repo'` -Controller = Ember.ArrayController.extend +Controller = Ember.Controller.extend + contentBinding: 'repos' actions: activate: (name) -> @activate(name) @@ -29,7 +30,7 @@ Controller = Ember.ArrayController.extend if @get('tab') == 'owned' && @get('isLoaded') && @get('length') == 0 @container.lookup('router:main').send('redirectToGettingStarted') - isLoadedBinding: 'content.isLoaded' + isLoadedBinding: 'repos.isLoaded' needs: ['currentUser', 'repo', 'runningJobs', 'queue'] currentUserBinding: 'controllers.currentUser.model' selectedRepo: (-> @@ -57,8 +58,8 @@ Controller = Ember.ArrayController.extend ).property() updateTimes: -> - if content = @get('content') - content.forEach (r) -> r.updateTimes() + if repos = @get('repos') + repos.forEach (r) -> r.updateTimes() activate: (tab, params) -> @set('sortProperties', ['sortOrder']) @@ -66,7 +67,7 @@ Controller = Ember.ArrayController.extend this["view_#{tab}".camelize()](params) viewOwned: -> - @set('content', @get('userRepos')) + @set('repos', @get('userRepos')) viewRunning: -> @@ -79,7 +80,7 @@ Controller = Ember.ArrayController.extend viewSearch: (phrase) -> @set('search', phrase) - @set('content', Repo.search(@store, phrase)) + @set('repos', Repo.search(@store, phrase)) searchObserver: (-> search = @get('search') diff --git a/app/routes/main-tab.coffee b/app/routes/main-tab.coffee index bbc1d4da..6cf21fb6 100644 --- a/app/routes/main-tab.coffee +++ b/app/routes/main-tab.coffee @@ -12,15 +12,17 @@ Route = TravisRoute.extend @controllerFor('repos').activate(@get('reposTabName')) @currentRepoDidChange() - @controllerFor('repos').addObserver('firstObject', this, 'currentRepoDidChange') + if repos = @controllerFor('repos').get('repos') + repos.addObserver('firstObject', this, 'currentRepoDidChange') deactivate: -> - @controllerFor('repos').removeObserver('firstObject', this, 'currentRepoDidChange') + if repos = @controllerFor('repos').get('repos') + repos.removeObserver('firstObject', this, 'currentRepoDidChange') @_super.apply(this, arguments) currentRepoDidChange: -> - if repo = @controllerFor('repos').get('firstObject') + if repo = @controllerFor('repos').get('repos.firstObject') @controllerFor('repo').set('repo', repo) actions: diff --git a/app/templates/components/repo-show-tabs.hbs b/app/templates/components/repo-show-tabs.hbs new file mode 100644 index 00000000..670869db --- /dev/null +++ b/app/templates/components/repo-show-tabs.hbs @@ -0,0 +1,83 @@ +
+
    +
  • + {{#if repo.slug}} + {{#link-to "repo" repo current-when="repo.index"}} + Current + {{/link-to}} + {{/if}} +
    • +
  • + {{#if repo.slug}} + {{#link-to "branches" repo}} + Branches + {{/link-to}} + {{/if}} +
    • +
  • + {{#if repo.slug}} + {{#link-to "builds" repo}} + Build History + {{/link-to}} + {{/if}} +
    • +
  • + {{#if repo.slug}} + {{#link-to "pullRequests" repo}} + Pull Requests + {{/link-to}} + {{/if}} +
    • +
  • + {{#if build.id}} + {{#if repo.slug}} + {{#link-to "build" repo build}} + Build #{{build.number}} + {{/link-to}} + {{/if}} + {{/if}} +
    • +
  • + {{#if job.id}} + {{#if repo.slug}} + {{#link-to "job" repo job}} + Job #{{job.number}} + {{/link-to}} + {{/if}} + {{/if}} +
    • +
  • + {{#if repo.slug}} + {{#link-to "settings" repo}} + Settings + {{/link-to}} + {{/if}} +
    • +
  • + {{#if repo.slug}} + {{#link-to "requests" repo}} + Requests + {{/link-to}} + {{/if}} +
    • + {{#if config.caches_enabled}} +
  • + {{#if repo.slug}} + {{#link-to "caches" repo}} + Caches + {{/link-to}} + {{/if}} +
    • + {{/if}} + +
  • + {{#if request.id}} + {{#if repo.slug}} + {{#link-to "request" repo request}} + Request #{{request.id}} + {{/link-to}} + {{/if}} + {{/if}} +
    • +
+
diff --git a/app/templates/components/repos-list-item.hbs b/app/templates/components/repos-list-item.hbs new file mode 100644 index 00000000..8b7f4b97 --- /dev/null +++ b/app/templates/components/repos-list-item.hbs @@ -0,0 +1,35 @@ +
+

+ {{#if repo.slug}} + + {{#link-to "repo" repo class="slug"}}{{repo.slug}}{{/link-to}} + {{/if}} +

+ {{#with repo.lastBuildHash as lastBuild}} + {{#if repo.slug}} + {{#if lastBuild.id}} +

+ + {{#link-to "build" repo lastBuild.id + class="last_build"}}{{lastBuild.number}}{{/link-to}} +

+ {{/if}} + {{/if}} + {{/with}} + +

+ + Duration: + + {{format-duration repo.lastBuildDuration}} + +

+ +

+ + Finished: + + {{format-time repo.lastBuildFinishedAt}} + +

+
diff --git a/app/templates/components/repos-list.hbs b/app/templates/components/repos-list.hbs new file mode 100644 index 00000000..faf4b471 --- /dev/null +++ b/app/templates/components/repos-list.hbs @@ -0,0 +1,7 @@ +{{#each repos as |repo|}} + {{repos-list-item repo=repo selectedRepo=selectedRepo}} +{{else}} +

{{noReposMessage}}

+{{/each}} + + diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs index 59131043..75e135c8 100644 --- a/app/templates/repo.hbs +++ b/app/templates/repo.hbs @@ -20,7 +20,7 @@
{{view 'repo-show-tools'}} - {{view 'repo-show-tabs'}} + {{repo-show-tabs repo=repo tab=tab}}
{{outlet}} diff --git a/app/templates/repos.hbs b/app/templates/repos.hbs index 7bf3f1d4..6ffa6c76 100644 --- a/app/templates/repos.hbs +++ b/app/templates/repos.hbs @@ -19,50 +19,7 @@ {{else}}
{{#if isLoaded}} - {{#collection 'repos-list' content=this}} - - {{#with view.repo as repo}} -
-

- {{#if repo.slug}} - - {{#link-to "repo" repo class="slug"}}{{repo.slug}}{{/link-to}} - {{/if}} -

- {{#with repo.lastBuildHash as lastBuild}} - {{#if repo.slug}} - {{#if lastBuild.id}} -

- - {{#link-to "build" repo lastBuild.id - class="last_build"}}{{lastBuild.number}}{{/link-to}} -

- {{/if}} - {{/if}} - {{/with}} - -

- - Duration: - - {{format-duration repo.lastBuildDuration}} - -

- -

- - Finished: - - {{format-time repo.lastBuildFinishedAt}} - -

-
- {{/with}} - - {{else}} -

{{noReposMessage}}

- {{/collection}} - + {{repos-list repos=repos selectedRepo=selectedRepo}} {{else}} {{loading-indicator center=true}} {{/if}} diff --git a/app/templates/repos/show/tabs.hbs b/app/templates/repos/show/tabs.hbs index e6cae01c..8b137891 100644 --- a/app/templates/repos/show/tabs.hbs +++ b/app/templates/repos/show/tabs.hbs @@ -1,83 +1 @@ -
-
    -
  • - {{#if repo.slug}} - {{#link-to "repo" repo current-when="repo.index"}} - Current - {{/link-to}} - {{/if}} -
    • -
  • - {{#if repo.slug}} - {{#link-to "branches" repo}} - Branches - {{/link-to}} - {{/if}} -
    • -
  • - {{#if repo.slug}} - {{#link-to "builds" repo}} - Build History - {{/link-to}} - {{/if}} -
    • -
  • - {{#if repo.slug}} - {{#link-to "pullRequests" repo}} - Pull Requests - {{/link-to}} - {{/if}} -
    • -
  • - {{#if build.id}} - {{#if repo.slug}} - {{#link-to "build" repo build}} - Build #{{build.number}} - {{/link-to}} - {{/if}} - {{/if}} -
    • -
  • - {{#if job.id}} - {{#if repo.slug}} - {{#link-to "job" repo job}} - Job #{{job.number}} - {{/link-to}} - {{/if}} - {{/if}} -
    • -
  • - {{#if repo.slug}} - {{#link-to "settings" repo}} - Settings - {{/link-to}} - {{/if}} -
    • -
  • - {{#if repo.slug}} - {{#link-to "requests" repo}} - Requests - {{/link-to}} - {{/if}} -
    • - {{#if config.caches_enabled}} -
  • - {{#if repo.slug}} - {{#link-to "caches" repo}} - Caches - {{/link-to}} - {{/if}} -
    • - {{/if}} -
  • - {{#if request.id}} - {{#if repo.slug}} - {{#link-to "request" repo request}} - Request #{{request.id}} - {{/link-to}} - {{/if}} - {{/if}} -
    • -
-
From 457f66b91ffce0389c5d954c291830c3d57a2eee Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 15 Jul 2015 10:51:04 +0200 Subject: [PATCH 05/11] Remove Visibility API usage from Pusher --- app/utils/pusher.coffee | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/app/utils/pusher.coffee b/app/utils/pusher.coffee index f1cff14e..b30bf247 100644 --- a/app/utils/pusher.coffee +++ b/app/utils/pusher.coffee @@ -12,13 +12,6 @@ TravisPusher.prototype.init = (config) -> Pusher.host = config.host if config.host @pusher = new Pusher(config.key, encrypted: config.encrypted, disableStats: true) - @callbacksToProcess = [] - - Visibility.change (e, state) => - @processSavedCallbacks() if state == 'visible' - - setInterval @processSavedCallbacks.bind(this), @processingIntervalWhenHidden - TravisPusher.prototype.subscribeAll = (channels) -> @subscribe(channel) for channel in channels @@ -45,35 +38,18 @@ TravisPusher.prototype.prefix = (channel) -> else channel -# process pusher messages in batches every 5 minutes when the page is hidden -TravisPusher.prototype.processingIntervalWhenHidden = 1000 * 60 * 5 - TravisPusher.prototype.receive = (event, data) -> return if event.substr(0, 6) == 'pusher' data = @normalize(event, data) if data.id - @processWhenVisible => - # TODO remove job:requeued, once sf-restart-event has been merged - # TODO this also needs to clear logs on build:created if matrix jobs are already loaded - if event == 'job:created' || event == 'job:requeued' - if job = @store.getById('job', data.job.id) - job.clearLog() + # TODO remove job:requeued, once sf-restart-event has been merged + # TODO this also needs to clear logs on build:created if matrix jobs are already loaded + if event == 'job:created' || event == 'job:requeued' + if job = @store.getById('job', data.job.id) + job.clearLog() - Ember.run.next => - @store.receivePusherEvent(event, data) - -TravisPusher.prototype.processSavedCallbacks = -> - while callback = @callbacksToProcess.shiftObject() - callback.call(this) - -TravisPusher.prototype.processLater = (callback) -> - @callbacksToProcess.pushObject(callback) - -TravisPusher.prototype.processWhenVisible = (callback) -> - if Visibility.hidden() && Visibility.isSupported() - @processLater(callback) - else - callback.call(this) + Ember.run.next => + @store.receivePusherEvent(event, data) TravisPusher.prototype.normalize = (event, data) -> switch event From c0f2416703d1fe9761a585618b793011eff4a671 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 5 Aug 2015 15:04:52 +0200 Subject: [PATCH 06/11] Debounce limit concurrent builds input in settings --- app/components/limit-concurrent-builds.coffee | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/components/limit-concurrent-builds.coffee b/app/components/limit-concurrent-builds.coffee index e4eff2d8..11ef37b9 100644 --- a/app/components/limit-concurrent-builds.coffee +++ b/app/components/limit-concurrent-builds.coffee @@ -11,7 +11,16 @@ LimitConcurrentBuildsComponent = Ember.Component.extend description ).property('enabled') + limitChanged: -> + repo = @get('repo') + limit = parseInt(@get('value')) + if limit + @set('isSaving', true) + savingFinished = => + @set('isSaving', false) + repo.saveSettings(maximum_number_of_builds: limit). + then(savingFinished, savingFinished) actions: toggle: -> unless @get('enabled') @@ -26,15 +35,6 @@ LimitConcurrentBuildsComponent = Ember.Component.extend @set('value', 0) limitChanged: -> - repo = @get('repo') - limit = parseInt(@get('value')) - if limit - @set('isSaving', true) - savingFinished = => - @set('isSaving', false) - - repo.saveSettings(maximum_number_of_builds: limit). - then(savingFinished, savingFinished) - + Ember.run.debounce(this, 'limitChanged', 1000) `export default LimitConcurrentBuildsComponent` From daeb5fa0561be54d65d9e41d6feacec619023e86 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 5 Aug 2015 14:53:03 +0200 Subject: [PATCH 07/11] Refactor repo tools to use components --- app/components/repo-show-tools.coffee | 47 +++++++++++ app/components/repos-list-item.coffee | 4 +- app/services/popup.coffee | 15 ++++ app/templates/components/repo-show-tools.hbs | 18 +++++ app/templates/repo.hbs | 2 +- app/templates/repos/show/tools.hbs | 46 ----------- app/views/application.coffee | 4 +- app/views/basic.coffee | 18 +---- app/views/pre.coffee | 4 +- app/views/repo-show-tools.coffee | 84 -------------------- app/views/repo.coffee | 3 +- 11 files changed, 93 insertions(+), 152 deletions(-) create mode 100644 app/components/repo-show-tools.coffee create mode 100644 app/services/popup.coffee create mode 100644 app/templates/components/repo-show-tools.hbs delete mode 100644 app/views/repo-show-tools.coffee diff --git a/app/components/repo-show-tools.coffee b/app/components/repo-show-tools.coffee new file mode 100644 index 00000000..c5101af8 --- /dev/null +++ b/app/components/repo-show-tools.coffee @@ -0,0 +1,47 @@ +`import Ember from 'ember'` +`import config from 'travis/config/environment'` + +RepoShowToolsComponent = Ember.Component.extend + popup: Ember.inject.service() + + click: (event) -> + if $(event.target).is('a') && $(event.target).parents('.dropdown-menu').length + @closeMenu() + + closeMenu: -> + $('.menu').removeClass('display') + + actions: + menu: -> + @get('popup').close() + $('#tools .menu').toggleClass('display') + return false + + hasPermission: (-> + if permissions = @get('currentUser.permissions') + permissions.contains parseInt(@get('repo.id')) + ).property('currentUser.permissions.length', 'repo.id') + + hasPushPermission: (-> + if permissions = @get('currentUser.pushPermissions') + permissions.contains parseInt(@get('repo.id')) + ).property('currentUser.pushPermissions.length', 'repo.id') + + hasAdminPermission: (-> + if permissions = @get('currentUser.adminPermissions') + permissions.contains parseInt(@get('repo.id')) + ).property('currentUser.adminPermissions.length', 'repo.id') + + displaySettingsLink: (-> + @get('hasPushPermission') + ).property('hasPushPermission') + + displayCachesLink: (-> + @get('hasPushPermission') && config.endpoints.caches + ).property('hasPushPermission') + + displayStatusImages: (-> + @get('hasPermission') + ).property('hasPermission') + +`export default RepoShowToolsComponent` diff --git a/app/components/repos-list-item.coffee b/app/components/repos-list-item.coffee index 1d620188..af4ee542 100644 --- a/app/components/repos-list-item.coffee +++ b/app/components/repos-list-item.coffee @@ -3,6 +3,8 @@ `import { colorForState } from 'travis/utils/helpers'` ReposListItemComponent = Ember.Component.extend Polling, + routing: Ember.inject.service('-routing') + tagName: 'li' pollModels: 'repo' @@ -24,6 +26,6 @@ ReposListItemComponent = Ember.Component.extend Polling, click: -> @scrollTop() - @get('controller').transitionToRoute('/' + @get('repo.slug')) + @get('routing').transitionTo('repo', @get('repo.slug').split('/')) `export default ReposListItemComponent` diff --git a/app/services/popup.coffee b/app/services/popup.coffee new file mode 100644 index 00000000..83c8e37e --- /dev/null +++ b/app/services/popup.coffee @@ -0,0 +1,15 @@ +`import Ember from 'ember'` + +PopupService = Ember.Service.extend + open: (name) -> + @closeAll() + name = event?.target?.name || name + $("##{name}").toggleClass('display') + close: -> + if view = Ember.View.currentPopupView + view.destroy() + Ember.View.currentPopupView = null + + $('.popup').removeClass('display') + +`export default PopupService` diff --git a/app/templates/components/repo-show-tools.hbs b/app/templates/components/repo-show-tools.hbs new file mode 100644 index 00000000..5300edd9 --- /dev/null +++ b/app/templates/components/repo-show-tools.hbs @@ -0,0 +1,18 @@ +
+ Settings +
    + {{#if displaySettingsLink}} +
  • + {{#link-to "settings" repo}}Settings{{/link-to}} +
    • + {{/if}} +
  • + {{#link-to "requests" repo}}Requests{{/link-to}} +
    • + {{#if displayCachesLink}} +
  • + {{#link-to "caches" repo}}Caches{{/link-to}} +
    • + {{/if}} +
+
diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs index 75e135c8..2f1f4002 100644 --- a/app/templates/repo.hbs +++ b/app/templates/repo.hbs @@ -18,7 +18,7 @@
- {{view 'repo-show-tools'}} + {{repo-show-tools repo=repo build=build job=job tab=tab currentUser=auth.currentUser}} {{repo-show-tabs repo=repo tab=tab}}
diff --git a/app/templates/repos/show/tools.hbs b/app/templates/repos/show/tools.hbs index 2ef2e9e9..8b137891 100644 --- a/app/templates/repos/show/tools.hbs +++ b/app/templates/repos/show/tools.hbs @@ -1,47 +1 @@ -
- Settings -
    - {{#if view.displaySettingsLink}} -
  • - {{#link-to "settings" view.repo}}Settings{{/link-to}} -
    • - {{/if}} -
  • - {{#link-to "requests" view.repo}}Requests{{/link-to}} -
    • - {{#if view.displayCachesLink}} -
  • - {{#link-to "caches" view.repo}}Caches{{/link-to}} -
    • - {{/if}} -
-
- - - - diff --git a/app/views/application.coffee b/app/views/application.coffee index d14ffb73..7048cd6f 100644 --- a/app/views/application.coffee +++ b/app/views/application.coffee @@ -1,6 +1,8 @@ `import BasicView from 'travis/views/basic'` View = BasicView.extend + popup: Ember.inject.service() + classNames: ['application'] click: (event) -> # TODO: this solves the case of closing menus and popups, @@ -8,7 +10,7 @@ View = BasicView.extend # yet, but this does not seem optimal targetAndParents = $(event.target).parents().andSelf() if ! ( targetAndParents.hasClass('open-popup') || targetAndParents.hasClass('popup') ) - @popupCloseAll() + @get('popup').close() # TODO: I needed to add second check to this conditional, because for some reason # event.stopPropagation() in menu() function in RepoShowToolsView does diff --git a/app/views/basic.coffee b/app/views/basic.coffee index c302c38b..46fb86a2 100644 --- a/app/views/basic.coffee +++ b/app/views/basic.coffee @@ -1,21 +1,5 @@ `import Ember from 'ember'` -View = Ember.View.extend - actions: - popup: (name) -> @popup(name) - popupClose: -> @popupClose() - - popup: (name) -> - @popupCloseAll() - name = event?.target?.name || name - $("##{name}").toggleClass('display') - popupClose: -> - $('.popup').removeClass('display') - popupCloseAll: -> - if view = Ember.View.currentPopupView - view.destroy() - Ember.View.currentPopupView = null - - $('.popup').removeClass('display') +View = Ember.View.extend() `export default View` diff --git a/app/views/pre.coffee b/app/views/pre.coffee index 708deab4..68c17961 100644 --- a/app/views/pre.coffee +++ b/app/views/pre.coffee @@ -42,6 +42,8 @@ Object.defineProperty Log.Limit.prototype, 'limited', @count >= @max_lines View = BasicView.extend + popup: Ember.inject.service() + templateName: 'jobs/pre' currentUserBinding: 'controller.auth.currentUser' @@ -144,7 +146,7 @@ View = BasicView.extend removeLogPopup: -> if @get('canRemoveLog') - @popup('remove-log-popup') + @get('popup').open('remove-log-popup') return false noop: -> # TODO required? diff --git a/app/views/repo-show-tools.coffee b/app/views/repo-show-tools.coffee deleted file mode 100644 index dc0f991b..00000000 --- a/app/views/repo-show-tools.coffee +++ /dev/null @@ -1,84 +0,0 @@ -`import Ember from 'ember'` -`import BasicView from 'travis/views/basic'` -`import config from 'travis/config/environment'` - -View = BasicView.extend - templateName: 'repos/show/tools' - - repoBinding: 'controller.repo' - buildBinding: 'controller.build' - jobBinding: 'controller.job' - tabBinding: 'controller.tab' - currentUserBinding: 'controller.auth.currentUser' - slugBinding: 'controller.repo.slug' - - - didInsertElement: -> - self = this - $('.menu a').on 'click', -> - self.closeMenu() - - willRemoveElement: -> - $('.menu a').off 'click' - - closeMenu: -> - $('.menu').removeClass('display') - - actions: - menu: -> - @popupCloseAll() - $('#tools .menu').toggleClass('display') - return false - - regenerateKeyPopup: -> - if @get('canRegenerateKey') - @set('active', true) - @closeMenu() - @popup('regenerate-key-popup') - return false - - regenerateKey: -> - @popupCloseAll() - - (@get('repo.content') || @get('repo')).regenerateKey - success: => - @popup('regeneration-success') - error: -> - Travis.lookup('controller:flash').loadFlashes([{ error: 'Travis encountered an error while trying to regenerate the key, please try again.'}]) - - canRegenerateKey: (-> - @get('hasAdminPermission') - ).property('hasAdminPermission') - - hasPermission: (-> - if permissions = @get('currentUser.permissions') - permissions.contains parseInt(@get('repo.id')) - ).property('currentUser.permissions.length', 'repo.id') - - hasPushPermission: (-> - if permissions = @get('currentUser.pushPermissions') - permissions.contains parseInt(@get('repo.id')) - ).property('currentUser.pushPermissions.length', 'repo.id') - - hasAdminPermission: (-> - if permissions = @get('currentUser.adminPermissions') - permissions.contains parseInt(@get('repo.id')) - ).property('currentUser.adminPermissions.length', 'repo.id') - - displayRegenerateKey: (-> - @get('canRegenerateKey') - ).property('canRegenerateKey') - - displaySettingsLink: (-> - @get('hasPushPermission') - ).property('hasPushPermission') - - displayCachesLink: (-> - @get('hasPushPermission') && config.endpoints.caches - ).property('hasPushPermission') - - displayStatusImages: (-> - @get('hasPermission') - ).property('hasPermission') - -`export default View` diff --git a/app/views/repo.coffee b/app/views/repo.coffee index 90a3db2c..d6035868 100644 --- a/app/views/repo.coffee +++ b/app/views/repo.coffee @@ -5,6 +5,7 @@ `import Polling from 'travis/mixins/polling'` View = BasicView.extend Polling, + popup: Ember.inject.service() reposBinding: 'controllers.repos' repoBinding: 'controller.repo' buildBinding: 'controller.build' @@ -25,7 +26,7 @@ View = BasicView.extend Polling, actions: statusImages: () -> - @popupCloseAll() + @get('popup').close() view = StatusImagesView.create(toolsView: this, container: @container) BasicView.currentPopupView = view view.appendTo($('body')) From 7e597945716c6d370db15cccc12814443c3db020 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 6 Aug 2015 11:34:25 +0200 Subject: [PATCH 08/11] Fix log clearing after job restart In glimmer world rerender doesn't work as before and since we manage log element manually, we need to also clear it manually and reset the log properly --- app/views/pre.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/pre.coffee b/app/views/pre.coffee index 68c17961..fa7cb118 100644 --- a/app/views/pre.coffee +++ b/app/views/pre.coffee @@ -62,15 +62,18 @@ View = BasicView.extend @teardownLog() versionDidChange: (-> - @rerender() if @get('_state') == 'inDOM' + this.$('#log').empty() + @teardownLog() + @createEngine() ).observes('log.version') logDidChange: (-> console.log 'log view: log did change: rerender' if Log.DEBUG + this.$('#log').empty() + @teardownLog() if @get('log') @createEngine() - @rerender() if @get('_state') == 'inDOM' ).observes('log') teardownLog: -> From 8c35e42b2bbbcfcc1e839d2fcdbbb1bdb743dce2 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 6 Aug 2015 12:03:51 +0200 Subject: [PATCH 09/11] Fix show more button by changing it into component --- app/{views => components}/show-more-button.coffee | 10 ++++------ app/controllers/builds.coffee | 4 ++++ app/templates/builds.hbs | 2 +- app/templates/components/show-more-button.hbs | 1 + app/templates/show-more-button.hbs | 1 - 5 files changed, 10 insertions(+), 8 deletions(-) rename app/{views => components}/show-more-button.coffee (65%) create mode 100644 app/templates/components/show-more-button.hbs delete mode 100644 app/templates/show-more-button.hbs diff --git a/app/views/show-more-button.coffee b/app/components/show-more-button.coffee similarity index 65% rename from app/views/show-more-button.coffee rename to app/components/show-more-button.coffee index 6c11fe6f..392824fe 100644 --- a/app/views/show-more-button.coffee +++ b/app/components/show-more-button.coffee @@ -1,21 +1,19 @@ `import Ember from 'ember'` -View = Ember.View.extend +ShowMoreButtonComponent = Ember.Component.extend tagName: 'button' classNames: ['button button--grey button--showmore'] classNameBindings: ['isLoading', 'showMore'] showMore: true attributeBindings: ['disabled'] - isLoadingBinding: 'controller.isLoading' - templateName: 'show-more-button' disabledBinding: 'isLoading' - label: (-> + buttonLabel: (-> if @get('isLoading') then 'Loading' else 'Show more' ).property('isLoading') click: -> - @get('controller').showMore() + this.attrs.showMore() -`export default View` +`export default ShowMoreButtonComponent` diff --git a/app/controllers/builds.coffee b/app/controllers/builds.coffee index 7bd25ad8..6e50de35 100644 --- a/app/controllers/builds.coffee +++ b/app/controllers/builds.coffee @@ -28,4 +28,8 @@ Controller = Ember.ArrayController.extend @store.find('build', options) + actions: + showMoreBuilds: -> + @showMore() + `export default Controller` diff --git a/app/templates/builds.hbs b/app/templates/builds.hbs index e9cd7322..8b1aaa74 100644 --- a/app/templates/builds.hbs +++ b/app/templates/builds.hbs @@ -7,7 +7,7 @@ {{/each}} {{#if displayShowMoreButton}}

- {{view 'show-more-button'}} + {{show-more-button isLoading=isLoading showMore=(action 'showMoreBuilds')}} {{#if isLoading}} {{loading-indicator}} {{/if}} diff --git a/app/templates/components/show-more-button.hbs b/app/templates/components/show-more-button.hbs new file mode 100644 index 00000000..0bb41de2 --- /dev/null +++ b/app/templates/components/show-more-button.hbs @@ -0,0 +1 @@ +{{buttonLabel}} diff --git a/app/templates/show-more-button.hbs b/app/templates/show-more-button.hbs deleted file mode 100644 index d387f91f..00000000 --- a/app/templates/show-more-button.hbs +++ /dev/null @@ -1 +0,0 @@ -{{view.label}} From a0ca1ec66bbbd12155d754f83a42438012518072 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 6 Aug 2015 13:14:41 +0200 Subject: [PATCH 10/11] Change running jobs and queue into components --- app/components/queued-jobs.coffee | 16 ++++++++++ app/components/running-jobs.coffee | 20 +++++++++++++ app/controllers/queue.coffee | 14 --------- app/controllers/repos.coffee | 29 ++++++++++++++++--- app/controllers/running-jobs.coffee | 24 --------------- .../{queue.hbs => components/queued-jobs.hbs} | 6 ++-- .../{ => components}/running-jobs.hbs | 6 ++-- app/templates/repos.hbs | 4 +-- app/views/running-jobs.coffee | 8 ----- 9 files changed, 69 insertions(+), 58 deletions(-) create mode 100644 app/components/queued-jobs.coffee create mode 100644 app/components/running-jobs.coffee delete mode 100644 app/controllers/queue.coffee delete mode 100644 app/controllers/running-jobs.coffee rename app/templates/{queue.hbs => components/queued-jobs.hbs} (90%) rename app/templates/{ => components}/running-jobs.hbs (91%) delete mode 100644 app/views/running-jobs.coffee diff --git a/app/components/queued-jobs.coffee b/app/components/queued-jobs.coffee new file mode 100644 index 00000000..dfea033e --- /dev/null +++ b/app/components/queued-jobs.coffee @@ -0,0 +1,16 @@ +`import Ember from 'ember'` +`import config from 'travis/config/environment'` + +QueuedJobsComponent = Ember.Component.extend + store: Ember.inject.service() + + init: -> + @_super.apply this, arguments + if !Ember.testing + Visibility.every config.intervals.updateTimes, @updateTimes.bind(this) + + updateTimes: -> + if jobs = @get('jobs') + jobs.forEach (job) -> job.updateTimes() + +`export default QueuedJobsComponent` diff --git a/app/components/running-jobs.coffee b/app/components/running-jobs.coffee new file mode 100644 index 00000000..3e97c933 --- /dev/null +++ b/app/components/running-jobs.coffee @@ -0,0 +1,20 @@ +`import Ember from 'ember'` +`import Polling from 'travis/mixins/polling'` +`import config from 'travis/config/environment'` + +RunningJobsComponent = Ember.Component.extend Polling, + store: Ember.inject.service() + + pollHook: (store) -> + @get('store').find('job', {}) + + init: -> + @_super.apply this, arguments + if !Ember.testing + Visibility.every config.intervals.updateTimes, @updateTimes.bind(this) + + updateTimes: -> + if jobs = @get('jobs') + jobs.forEach (job) -> job.updateTimes() + +`export default RunningJobsComponent` diff --git a/app/controllers/queue.coffee b/app/controllers/queue.coffee deleted file mode 100644 index a89d1b28..00000000 --- a/app/controllers/queue.coffee +++ /dev/null @@ -1,14 +0,0 @@ -`import Ember from 'ember'` - -Controller = Ember.ArrayController.extend - isLoaded: false - content: (-> - result = @store.filter('job', {}, (job) -> - ['created', 'queued'].indexOf(job.get('state')) != -1 - ) - result.then => - @set('isLoaded', true) - result - ).property() - -`export default Controller` diff --git a/app/controllers/repos.coffee b/app/controllers/repos.coffee index dcf43dda..ccecfba8 100644 --- a/app/controllers/repos.coffee +++ b/app/controllers/repos.coffee @@ -31,7 +31,7 @@ Controller = Ember.Controller.extend @container.lookup('router:main').send('redirectToGettingStarted') isLoadedBinding: 'repos.isLoaded' - needs: ['currentUser', 'repo', 'runningJobs', 'queue'] + needs: ['currentUser', 'repo'] currentUserBinding: 'controllers.currentUser.model' selectedRepo: (-> # we need to observe also repo.content here, because we use @@ -40,16 +40,37 @@ Controller = Ember.Controller.extend @get('controllers.repo.repo.content') || @get('controllers.repo.repo') ).property('controllers.repo.repo', 'controllers.repo.repo.content') - startedJobsCount: Ember.computed.alias('controllers.runningJobs.length') + startedJobsCount: Ember.computed.alias('runningJobs.length') allJobsCount: (-> - @get('startedJobsCount') + @get('controllers.queue.length') - ).property('startedJobsCount', 'controllers.queue.length') + @get('startedJobsCount') + @get('queuedJobs.length') + ).property('startedJobsCount', 'queuedJobs.length') init: -> @_super.apply this, arguments if !Ember.testing Visibility.every @config.intervals.updateTimes, @updateTimes.bind(this) + runningJobs: (-> + # TODO: this should also query for received jobs + result = @store.filter('job', {}, (job) -> + ['started', 'received'].indexOf(job.get('state')) != -1 + ) + result.set('isLoaded', false) + result.then => + result.set('isLoaded', true) + result + ).property() + + queuedJobs: (-> + result = @get('store').filter('job', {}, (job) -> + ['created', 'queued'].indexOf(job.get('state')) != -1 + ) + result.set('isLoaded', false) + result.then => + result.set('isLoaded', true) + result + ).property() + recentRepos: (-> # I return an empty array here, because we're removing left sidebar, but # I don't want to refactor too much code (it will be all changed anyway diff --git a/app/controllers/running-jobs.coffee b/app/controllers/running-jobs.coffee deleted file mode 100644 index 1058b304..00000000 --- a/app/controllers/running-jobs.coffee +++ /dev/null @@ -1,24 +0,0 @@ -`import Ember from 'ember'` - -Controller = Ember.ArrayController.extend - init: -> - @_super.apply this, arguments - if !Ember.testing - Visibility.every @config.intervals.updateTimes, @updateTimes.bind(this) - - updateTimes: -> - if content = @get('content') - content.forEach (job) -> job.updateTimes() - - isLoaded: false - content: (-> - # TODO: this should also query for received jobs - result = @store.filter('job', {}, (job) -> - ['started', 'received'].indexOf(job.get('state')) != -1 - ) - result.then => - @set('isLoaded', true) - result - ).property() - -`export default Controller` diff --git a/app/templates/queue.hbs b/app/templates/components/queued-jobs.hbs similarity index 90% rename from app/templates/queue.hbs rename to app/templates/components/queued-jobs.hbs index a2d70ec2..27b545e3 100644 --- a/app/templates/queue.hbs +++ b/app/templates/components/queued-jobs.hbs @@ -1,6 +1,6 @@ -{{#if isLoaded}} - {{#if length}} - {{#each job in controller}} +{{#if jobs.isLoaded}} + {{#if jobs.length}} + {{#each jobs as |job|}}

{{#if job.repo.slug}} diff --git a/app/templates/running-jobs.hbs b/app/templates/components/running-jobs.hbs similarity index 91% rename from app/templates/running-jobs.hbs rename to app/templates/components/running-jobs.hbs index a04e187b..a1a45fc2 100644 --- a/app/templates/running-jobs.hbs +++ b/app/templates/components/running-jobs.hbs @@ -1,6 +1,6 @@ -{{#if isLoaded}} - {{#if controller.length}} - {{#each job in controller}} +{{#if jobs.isLoaded}} + {{#if jobs.length}} + {{#each jobs as |job| }}
{{#if job.repo.slug}} diff --git a/app/templates/repos.hbs b/app/templates/repos.hbs index 6ffa6c76..0451b2af 100644 --- a/app/templates/repos.hbs +++ b/app/templates/repos.hbs @@ -9,11 +9,11 @@ {{#if showRunningJobs}}
- {{render "runningJobs"}} + {{running-jobs jobs=runningJobs}}
- {{render "queue"}} + {{queued-jobs jobs=queuedJobs}}
{{else}} diff --git a/app/views/running-jobs.coffee b/app/views/running-jobs.coffee deleted file mode 100644 index 11c9a768..00000000 --- a/app/views/running-jobs.coffee +++ /dev/null @@ -1,8 +0,0 @@ -`import BasicView from 'travis/views/basic'` -`import Polling from 'travis/mixins/polling'` - -View = BasicView.extend Polling, - pollHook: (store) -> - @get('controller.store').find('job', {}) - -`export default View` From e382d3015db04f97908cb31e127694f4aa86156b Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 7 Aug 2015 13:05:14 +0200 Subject: [PATCH 11/11] We can get push access info from current user record --- app/routes/settings.coffee | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/app/routes/settings.coffee b/app/routes/settings.coffee index 76889e85..2c94c1da 100644 --- a/app/routes/settings.coffee +++ b/app/routes/settings.coffee @@ -44,21 +44,9 @@ Route = TravisRoute.extend hasPushAccess: -> repoId = parseInt @modelFor('repo').get('id') - pushAccess = true - Ajax.get '/users/permissions', (data) => - - admin = data.admin.filter (item) -> - return item == repoId - push = data.push.filter (item) -> - return item == repoId - pull = data.pull.filter (item) -> - return item == repoId - - if Ember.isEmpty admin && Ember.isEmpty push && !Ember.isEmpty pull - pushAccess = false - - pushAccess + @auth.get('currentUser').get('pushPermissions').filter (item) -> + item == repoId model: () -> return Ember.RSVP.hash({