Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-27 02:58:05 +01:00
Code Issues Projects Releases Wiki Activity

Update UI to support deleting OIDC users (#15305)

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
孙世军 2021-07-13 15:28:53 +08:00 committed by GitHub
parent f7a4401dcb
commit 8fb76689ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/base/left-side-nav/user/user.component.html
View File

@ -21,7 +21,7 @@
<div class="dropdown-divider"></div>
<button id="deleteUser" type="button" class="btn btn-secondary"
(click)="deleteUsers(selectedRow)"
[disabled]="!selectedRow.length || onlySelf || !canCreateUser">
[disabled]="!selectedRow.length || onlySelf">
<clr-icon shape="times" size="16"></clr-icon>&nbsp;{{'USER.DEL_ACTION' | translate}}
</button>
</clr-dropdown>

25
src/portal/src/app/base/left-side-nav/user/user.component.ts
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
import { Subscription, Observable, forkJoin } from "rxjs";
import { Subscription, Observable, forkJoin, of } from "rxjs";
import { TranslateService } from '@ngx-translate/core';
import { MessageHandlerService } from '../../../shared/services/message-handler.service';
import { SessionService } from '../../../shared/services/session.service';
@ -22,7 +22,6 @@ import { UserService } from './user.service';
import { User } from './user';
import { ChangePasswordComponent } from "./change-password/change-password.component";
import { map, catchError } from 'rxjs/operators';
import { throwError as observableThrowError } from "rxjs";
import { OperationService } from "../../../shared/components/operation/operation.service";
import { operateChanges, OperateInfo, OperationState } from "../../../shared/components/operation/operate";
import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service";
@ -34,6 +33,7 @@ import {
} from "../../../shared/entities/shared.const";
import { errorHandler } from "../../../shared/units/shared.utils";
import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message";
import { HttpErrorResponse } from "@angular/common/http";
/**
@ -265,12 +265,25 @@ export class UserComponent implements OnInit, OnDestroy {
observableLists.push(this.delOperate(user));
});
forkJoin(...observableLists).subscribe((item) => {
forkJoin(...observableLists).subscribe((resArr) => {
let error;
if (resArr && resArr.length) {
resArr.forEach(item => {
if (item instanceof HttpErrorResponse) {
error = errorHandler(item);
}
});
}
if (error) {
this.msgHandler.handleError(error);
} else {
this.translate.get("BATCH.DELETED_SUCCESS").subscribe(res => {
this.msgHandler.showSuccess(res);
});
}
this.selectedRow = [];
this.currentTerm = '';
this.refresh();
}, error => {
this.msgHandler.handleError(error);
});
}
}
@ -299,7 +312,7 @@ export class UserComponent implements OnInit, OnDestroy {
this.translate.get(message).subscribe(res =>
operateChanges(operMessage, OperationState.failure, res)
);
return observableThrowError(error);
return of(error);
}));
}