Merge pull request #348 from travis-ci/hooks-activation-error-message
Hooks activation error message
This commit is contained in:
Piotr Sarnacki
commit
212efad6f2
18
app/components/hook-switch.coffee
Normal file
18
app/components/hook-switch.coffee
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
`import Ember from 'ember'`
|
||||
|
||||
HookSwitchComponent = Ember.Component.extend
|
||||
tagName: 'a'
|
||||
classNames: ['travis-switch', 'switch']
|
||||
classNameBindings: ['active']
|
||||
activeBinding: "hook.active"
|
||||
|
||||
click: ->
|
||||
@sendAction('onToggle')
|
||||
hook = @get('hook')
|
||||
hook.toggle().then( (->), =>
|
||||
@toggleProperty('hook.active')
|
||||
@sendAction('onToggleError', hook)
|
||||
)
|
||||
|
||||
|
||||
`export default HookSwitchComponent`
|
||||
21
app/components/hooks-list-item.coffee
Normal file
21
app/components/hooks-list-item.coffee
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
`import Ember from 'ember'`
|
||||
`import config from 'travis/config/environment'`
|
||||
|
||||
HooksListItemComponent = Ember.Component.extend
|
||||
tagName: 'li'
|
||||
classNames: ['row']
|
||||
classNameBindings: ['hook.active:active']
|
||||
|
||||
githubOrgsOauthAccessSettingsUrl: config.githubOrgsOauthAccessSettingsUrl
|
||||
|
||||
actions:
|
||||
handleToggleError: ->
|
||||
@set("showError", true)
|
||||
|
||||
close: ->
|
||||
@send('resetErrors')
|
||||
|
||||
resetErrors: ->
|
||||
@set("showError", false)
|
||||
|
||||
`export default HooksListItemComponent`
|
||||
|
|
@ -124,12 +124,12 @@ p.profile-user-last
|
|||
clear: both
|
||||
margin-bottom: .8em
|
||||
overflow: auto
|
||||
> div
|
||||
width: grid-calc(10, 24)
|
||||
@media #{$medium-up}
|
||||
width: grid-calc(7, 24)
|
||||
@media #{$large-up}
|
||||
width: grid-calc(5, 24)
|
||||
.profile-hooks
|
||||
width: grid-calc(10, 24)
|
||||
@media #{$medium-up}
|
||||
width: grid-calc(7, 24)
|
||||
@media #{$large-up}
|
||||
width: grid-calc(5, 24)
|
||||
.switch
|
||||
display: inline-block
|
||||
.profile-settings
|
||||
|
|
@ -190,4 +190,28 @@ p.profile-user-last
|
|||
line-height: $line-height-m
|
||||
a
|
||||
color: #adaaab
|
||||
text-decoration: underline
|
||||
text-decoration: underline
|
||||
|
||||
.error
|
||||
width: 100%;
|
||||
padding: 0 $column-gutter/2;
|
||||
p
|
||||
position: relative
|
||||
padding: $column-gutter/2 $column-gutter*2 $column-gutter/2 $column-gutter/2;
|
||||
color: #de4248
|
||||
background-color: #f1b6ad
|
||||
&:after
|
||||
content: ""
|
||||
position: absolute
|
||||
top: -0.5em
|
||||
left: 1.5em
|
||||
width: 1.2em
|
||||
height: 1.2em
|
||||
background: #f1b6ad
|
||||
transform: rotate(45deg)
|
||||
.close
|
||||
@extend .icon
|
||||
position: absolute
|
||||
top: 1em
|
||||
right: 1em
|
||||
@extend .icon--dismiss-red
|
||||
|
|
|
|||
|
|
@ -21,28 +21,47 @@
|
|||
</div>
|
||||
{{/if}}
|
||||
|
||||
<div class="profile-header">
|
||||
<h1>{{view.name}}</h1>
|
||||
</div>
|
||||
<div class="profile-header">
|
||||
<h1>{{view.name}}</h1>
|
||||
</div>
|
||||
|
||||
{{#if user.isSyncing}}
|
||||
<div class="sync-button">
|
||||
<button class="button is-syncing">
|
||||
<span class="sync-spinner"><i></i><i></i><i></i></span>Syncing from GitHub
|
||||
</button>
|
||||
</div>
|
||||
</header>
|
||||
{{else}}
|
||||
<div class="sync-button">
|
||||
<button {{action sync}} class="button">
|
||||
<span class="icon icon-sync"></span>Sync
|
||||
</button>
|
||||
<p class="sync-last">last synced {{format-time user.syncedAt}}</p>
|
||||
</div>
|
||||
{{#if config.pro}}
|
||||
<p>We're only showing your private repositories. You can find your public projects on <a href="https://travis-ci.org" title="travis-ci.org">travis-ci.org</a>.</p>
|
||||
{{else}}
|
||||
<p>We're only showing your public repositories. You can find your private projects on <a href="https://travis-ci.com" title="travis-ci.com">travis-ci.com</a>.</p>
|
||||
{{#if user.isSyncing}}
|
||||
<div class="sync-button">
|
||||
<button class="button is-syncing">
|
||||
<span class="sync-spinner"><i></i><i></i><i></i></span>Syncing from GitHub
|
||||
</button>
|
||||
</div>
|
||||
{{else}}
|
||||
<div class="sync-button">
|
||||
<button {{action sync}} class="button">
|
||||
<span class="icon icon-sync"></span>Sync
|
||||
</button>
|
||||
<p class="sync-last">last synced {{format-time user.syncedAt}}</p>
|
||||
</div>
|
||||
{{#if config.billingEndpoint}}
|
||||
<div class="cta-btn">
|
||||
{{#if view.subscribed}}
|
||||
<a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
|
||||
Subscription active!
|
||||
</a>
|
||||
{{else}}
|
||||
{{#if view.education}}
|
||||
<a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
|
||||
Educational account!
|
||||
</a>
|
||||
{{else}}
|
||||
<a class="btn btn-activate" {{bind-attr href="billingUrl"}}>
|
||||
Sign up this account!
|
||||
</a>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
{{#if config.pro}}
|
||||
<p>We're only showing your private repositories. You can find your public projects on <a href="https://travis-ci.org" title="travis-ci.org">travis-ci.org</a>.</p>
|
||||
{{else}}
|
||||
<p>We're only showing your public repositories. You can find your private projects on <a href="https://travis-ci.com" title="travis-ci.com">travis-ci.com</a>.</p>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
</header>
|
||||
|
|
@ -74,20 +93,7 @@
|
|||
<div>
|
||||
<ul class="profile-hooklist">
|
||||
{{#each hook in hooks}}
|
||||
<li {{bind-attr class="hook.active:active :row"}}>
|
||||
<div class="columns">
|
||||
{{travis-switch action="toggle" target=hook toggleAutomatically="false"}}
|
||||
{{!-- <button class="switch is-on"></button> --}}
|
||||
{{#if hook.isSaving}}
|
||||
<span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
|
||||
{{else}}
|
||||
{{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}<span class="icon icon--cog"></span>{{/link-to}}
|
||||
{{/if}}
|
||||
</div>
|
||||
<a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns">
|
||||
{{hook.slug}}
|
||||
<span>{{hook.description}}</span></a>
|
||||
</li>
|
||||
{{hooks-list-item hook=hook}}
|
||||
{{else}}
|
||||
<li>
|
||||
{{#if hooksWithoutAdmin.length}}
|
||||
|
|
@ -100,26 +106,26 @@
|
|||
</ul>
|
||||
</div>
|
||||
|
||||
{{#if hooksWithoutAdmin.length}}
|
||||
<div id="unadministerable-hooks">
|
||||
<p>You require admin rights to enable these repositories</p>
|
||||
{{#if hooksWithoutAdmin.length}}
|
||||
<div id="unadministerable-hooks">
|
||||
<p>You require admin rights to enable these repositories</p>
|
||||
|
||||
<ul class="profile-hooklist">
|
||||
{{#each hook in hooksWithoutAdmin}}
|
||||
<li {{bind-attr class="hook.active:active :row"}}>
|
||||
<div class="columns">
|
||||
<button class="switch disabled"></button>
|
||||
</div>
|
||||
<a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns">
|
||||
{{hook.slug}}
|
||||
<span>{{hook.description}}</span>
|
||||
</a>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</div>
|
||||
{{/if}}
|
||||
<ul class="profile-hooklist">
|
||||
{{#each hook in hooksWithoutAdmin}}
|
||||
<li {{bind-attr class="hook.active:active :row"}}>
|
||||
<div class="columns">
|
||||
<button class="switch disabled"></button>
|
||||
</div>
|
||||
<a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns">
|
||||
{{hook.slug}}
|
||||
<span>{{hook.description}}</span>
|
||||
</a>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{else}}
|
||||
<span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
|
||||
{{/if}}
|
||||
|
|
|
|||
6
app/templates/components/hook-switch.hbs
Normal file
6
app/templates/components/hook-switch.hbs
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<span class="on">
|
||||
ON
|
||||
</span>
|
||||
<span class="off">
|
||||
OFF
|
||||
</span>
|
||||
28
app/templates/components/hooks-list-item.hbs
Normal file
28
app/templates/components/hooks-list-item.hbs
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
<div class="profile-hooks columns">
|
||||
{{hook-switch hook=hook onToggleError="handleToggleError" onToggle="resetErrors"}}
|
||||
{{!-- <button class="switch is-on"></button> --}}
|
||||
{{#if hook.isSaving}}
|
||||
<span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
|
||||
{{else}}
|
||||
{{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}<span class="icon icon--cog"></span>{{/link-to}}
|
||||
{{/if}}
|
||||
</div>
|
||||
<a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns">
|
||||
{{hook.slug}}
|
||||
<span>{{hook.description}}</span></a>
|
||||
|
||||
{{#if showError}}
|
||||
<div class="error">
|
||||
<p>
|
||||
An error happened when we tried to alter settings on GitHub.
|
||||
{{#if githubOrgsOauthAccessSettingsUrl}}
|
||||
It may be caused by API restrictions, please
|
||||
<a {{bind-attr href="githubOrgsOauthAccessSettingsUrl"}}
|
||||
title="Orgs Oauth Access Settings on GitHub">
|
||||
review and add
|
||||
</a> your authorized Orgs.
|
||||
{{/if}}
|
||||
<a class="close" {{action "close" target=view}}></a>
|
||||
</p>
|
||||
</div>
|
||||
{{/if}}
|
||||
17
tests/unit/components/hook-switch-test.coffee
Normal file
17
tests/unit/components/hook-switch-test.coffee
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
`import { test, moduleForComponent } from 'ember-qunit'`
|
||||
|
||||
moduleForComponent 'hook-switch', 'HookSwitchComponent', {
|
||||
# specify the other units that are required for this test
|
||||
# needs: ['component:foo', 'helper:bar']
|
||||
}
|
||||
|
||||
test 'it renders', ->
|
||||
expect 2
|
||||
|
||||
# creates the component instance
|
||||
component = @subject()
|
||||
equal component._state, 'preRender'
|
||||
|
||||
# appends the component to the page
|
||||
@append()
|
||||
equal component._state, 'inDOM'
|
||||
24
tests/unit/components/hooks-list-item-test.coffee
Normal file
24
tests/unit/components/hooks-list-item-test.coffee
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
`import { test, moduleForComponent } from 'ember-qunit'`
|
||||
|
||||
moduleForComponent 'hooks-list-item', 'HooksListItemComponent', {
|
||||
# specify the other units that are required for this test
|
||||
needs: ['component:hook-switch']
|
||||
}
|
||||
|
||||
test 'it renders', ->
|
||||
|
||||
attributes = {
|
||||
id: 10000,
|
||||
name: "foo-bar",
|
||||
owner_name: "foo",
|
||||
description: "A foo repo",
|
||||
active: true,
|
||||
urlGithub: "https://github.com/foo/foobar",
|
||||
slug: "foo/foo-bar"
|
||||
}
|
||||
component = @subject(hook: attributes)
|
||||
@append()
|
||||
|
||||
ok component.$().hasClass('active'), 'component should have active class'
|
||||
ok component.$('.travis-switch').hasClass('active'), 'switch should have active class'
|
||||
equal component.$('.profile-repo span').text().trim(), 'A foo repo', 'repo description should be displayed'
|
||||
Loading…
Reference in New Issue
Block a user