Merge pull request #3261 from quay/joseph.schorr/QUAY-1096/github-org

Add clear instructions to the github trigger setup on how to authorize additional organizations
This commit is contained in:
Joseph Schorr 2018-09-27 16:14:14 -04:00 committed by GitHub
commit 9cd17d78d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 3 deletions

View file

@ -0,0 +1,18 @@
.gh-button {
color: #0366d6;
background-color: #fff;
padding: 3px 10px;
font-size: 12px;
border: 1px solid rgba(27,31,35,0.2);
border-radius: 0.25em;
}
.gh-grant-message {
font-size: 16px;
margin-top: 20px;
}
.gh-grant-message b {
display: block;
margin-bottom: 10px;
}

View file

@ -61,8 +61,8 @@
<p>
<span class="registry-name"></span> has been granted access to read and view these {{ $ctrl.namespaceTitle }}s.
</p>
<p>
Don't see an expected {{ $ctrl.namespaceTitle }} here? Please make sure third-party access is enabled for <span class="registry-name"></span> under that {{ $ctrl.namespaceTitle }}.
<p class="co-alert co-alert-info gh-grant-message" ng-if="$ctrl.githost == 'github'">
<b>Don't see an expected organization here?</b>Please visit <a href="{{ $ctrl.githubTriggerEndpoint }}settings/connections/applications/{{ $ctrl.githubTriggerClientId }}" target="_blank" rel="nofollow noopener">Connections with <span class="registry-name"></span></a> and choose <span class="gh-button">Grant</span> or <span class="gh-button">Request</span> before reloading this page.
</p>
</div>
</linear-workflow-section><!-- /Section: Namespace -->

View file

@ -3,6 +3,7 @@ import * as moment from 'moment';
import { Local, Trigger, TriggerConfig, Repository, Namespace } from '../../../types/common.types';
import { ContextChangeEvent } from '../context-path-select/context-path-select.component';
import { PathChangeEvent } from '../dockerfile-path-select/dockerfile-path-select.component';
import './manage-trigger.component.css';
/**
@ -37,13 +38,17 @@ export class ManageTriggerComponent implements OnChanges {
private namespaceTitle: string;
private namespace: any;
private buildSource: string;
private githubTriggerEndpoint: string;
private githubTriggerClientId: string;
constructor(@Inject('ApiService') private apiService: any,
@Inject('TableService') private tableService: any,
@Inject('TriggerService') private triggerService: any,
@Inject('RolesService') private rolesService: any,
@Inject('KeyService') private keyService: any,
@Inject('$scope') private $scope: ng.IScope) {
this.githubTriggerEndpoint = keyService['githubTriggerEndpoint'];
this.githubTriggerClientId = keyService['githubTriggerClientId'];
}
public ngOnChanges(changes: SimpleChanges): void {