upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-27 18:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove loading state for new webhook button ()

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
Will Sun 2021-04-28 18:22:09 +08:00 committed by GitHub
parent afa3f6d3e4
commit d50da06023
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
src/portal/src/app/base/project/webhook
webhook.component.htmlwebhook.component.ts

2
src/portal/src/app/base/project/webhook/webhook.component.html

@ -4,7 +4,7 @@
<clr-dg-action-bar>
<div class="clr-row">
<div class="clr-col-7">
<button [disabled]="loadingMetadata||!hasCreatPermission" [clrLoading]="loadingMetadata||addBtnState" id="new-webhook" type="button" class="btn btn-secondary" (click)="newWebhook()">
<button [disabled]="loadingMetadata||!hasCreatPermission" [clrLoading]="loadingMetadata" id="new-webhook" type="button" class="btn btn-secondary" (click)="newWebhook()">
<clr-icon shape="plus" size="16"></clr-icon>
{{'WEBHOOK.NEW_WEBHOOK' | translate}}
</button>

6
src/portal/src/app/base/project/webhook/webhook.component.ts

@ -22,7 +22,7 @@ import { Project } from '../project';
import { clone, DEFAULT_PAGE_SIZE, getSortingString } from '../../../shared/units/utils';
import { forkJoin, Observable } from 'rxjs';
import { UserPermissionService, USERSTATICPERMISSION } from '../../../shared/services';
import { ClrDatagridStateInterface, ClrLoadingState } from '@clr/angular';
import { ClrDatagridStateInterface } from '@clr/angular';
import { ConfirmationDialogComponent } from "../../../shared/components/confirmation-dialog";
import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../shared/entities/shared.const";
import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message";
@ -53,7 +53,6 @@ export class WebhookComponent implements OnInit {
loadingTriggers: boolean = false;
hasCreatPermission: boolean = false;
hasUpdatePermission: boolean = false;
addBtnState: ClrLoadingState = ClrLoadingState.DEFAULT;
page: number = 1;
pageSize: number = DEFAULT_PAGE_SIZE;
total: number = 0;
@ -82,13 +81,10 @@ export class WebhookComponent implements OnInit {
USERSTATICPERMISSION.WEBHOOK.KEY, USERSTATICPERMISSION.WEBHOOK.VALUE.CREATE));
permissionsList.push(this.userPermissionService.getPermission(this.projectId,
USERSTATICPERMISSION.WEBHOOK.KEY, USERSTATICPERMISSION.WEBHOOK.VALUE.UPDATE));
this.addBtnState = ClrLoadingState.LOADING;
forkJoin(...permissionsList).subscribe(Rules => {
[this.hasCreatPermission, this.hasUpdatePermission] = Rules;
this.addBtnState = ClrLoadingState.SUCCESS;
}, error => {
this.messageHandlerService.error(error);
this.addBtnState = ClrLoadingState.ERROR;
});
}
refresh() {