Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-29 21:54:13 +01:00
Code Issues Projects Releases Wiki Activity

Add pagination support to label list (#14714)

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
Will Sun 2021-04-26 10:32:38 +08:00 committed by GitHub
parent 705cb5b55d
commit 0c724d3a44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 256 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.spec.ts
View File

@ -11,6 +11,7 @@ import { LabelService, SystemInfoService, UserPermissionService } from "../../..
import { ErrorHandler } from "../../../../../../shared/units/error-handler";
import { OperationService } from "../../../../../../shared/components/operation/operation.service";
import { delay } from "rxjs/operators";
import { SharedTestingModule } from "../../../../../../shared/shared.module";
describe('ChartVersionComponent', () => {
let component: ChartVersionComponent;
@ -85,13 +86,10 @@ describe('ChartVersionComponent', () => {
CUSTOM_ELEMENTS_SCHEMA
],
imports: [
ClarityModule,
TranslateModule.forRoot(),
FormsModule
SharedTestingModule
],
declarations: [ChartVersionComponent, LabelFilterComponent],
providers: [
TranslateService,
{ provide: SystemInfoService, useValue: mockSystemInfoService },
{ provide: LabelService, useValue: mockLabelService },
{ provide: UserPermissionService, useValue: mockUserPermissionService },

85
src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts
View File

@ -12,8 +12,7 @@ import { TranslateService } from "@ngx-translate/core";
import { HelmChartVersion, HelmChartMaintainer } from "../../helm-chart.interface.service";
import { HelmChartService } from "../../helm-chart.service";
import {
Label,
LabelService,
LabelService as OldLabelService,
State,
SystemInfo,
SystemInfoService,
@ -33,7 +32,9 @@ import { errorHandler } from "../../../../../../shared/units/shared.utils";
import { ConfirmationDialogComponent } from "../../../../../../shared/components/confirmation-dialog";
import { ConfirmationMessage } from "../../../../../global-confirmation-dialog/confirmation-message";
import { ConfirmationAcknowledgement } from "../../../../../global-confirmation-dialog/confirmation-state-message";
import { Label } from "../../../../../../../../ng-swagger-gen/models/label";
import { LabelService } from "../../../../../../../../ng-swagger-gen/services/label.service";
const PAGE_SIZE: number = 100;
@Component({
selector: "hbr-helm-chart-version",
templateUrl: "./helm-chart-version.component.html",
@ -82,7 +83,8 @@ export class ChartVersionComponent implements OnInit {
private errorHandlerEntity: ErrorHandler,
private systemInfoService: SystemInfoService,
private helmChartService: HelmChartService,
private resrouceLabelService: LabelService,
private labelService: LabelService,
private resrouceLabelService: OldLabelService,
public userPermissionService: UserPermissionService,
private operationService: OperationService,
private translateService: TranslateService,
@ -109,10 +111,77 @@ export class ChartVersionComponent implements OnInit {
}
getLabels() {
forkJoin(this.resrouceLabelService.getLabels("g"), this.resrouceLabelService.getProjectLabels(this.projectId))
.subscribe(
(labels) => {
this.labels = [].concat(...labels);
// get all project labels
this.labelService.ListLabelsResponse({
pageSize: PAGE_SIZE,
page: 1,
scope: 'p',
projectId: this.projectId
}).subscribe(res => {
if (res.headers) {
const xHeader: string = res.headers.get("X-Total-Count");
const totalCount = parseInt(xHeader, 0);
let arr = res.body || [];
if (totalCount <= PAGE_SIZE) { // already gotten all project labels
if (arr && arr.length) {
this.labels = this.labels.concat(arr);
}
} else { // get all the project labels in specified times
const times: number = Math.ceil(totalCount / PAGE_SIZE);
const observableList: Observable<Label[]>[] = [];
for (let i = 2; i <= times; i++) {
observableList.push(this.labelService.ListLabels({
page: i,
pageSize: PAGE_SIZE,
scope: 'p',
projectId: this.projectId
}));
}
forkJoin(observableList).subscribe(response => {
if (response && response.length) {
response.forEach(item => {
arr = arr.concat(item);
});
this.labels = this.labels.concat(arr);
}
});
}
}
});
// get all global labels
this.labelService.ListLabelsResponse({
pageSize: PAGE_SIZE,
page: 1,
scope: 'g',
}).subscribe(res => {
if (res.headers) {
const xHeader: string = res.headers.get("X-Total-Count");
const totalCount = parseInt(xHeader, 0);
let arr = res.body || [];
if (totalCount <= PAGE_SIZE) { // already gotten all global labels
if (arr && arr.length) {
this.labels = this.labels.concat(arr);
}
} else { // get all the global labels in specified times
const times: number = Math.ceil(totalCount / PAGE_SIZE);
const observableList: Observable<Label[]>[] = [];
for (let i = 2; i <= times; i++) {
observableList.push(this.labelService.ListLabels({
page: i,
pageSize: PAGE_SIZE,
scope: 'g',
}));
}
forkJoin(observableList).subscribe(response => {
if (response && response.length) {
response.forEach(item => {
arr = arr.concat(item);
});
this.labels = this.labels.concat(arr);
}
});
}
}
});
}

18
src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.spec.ts
View File

@ -3,15 +3,12 @@ import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
import { ArtifactListTabComponent } from "./artifact-list-tab.component";
import { of } from "rxjs";
import { delay } from "rxjs/operators";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { HttpClientTestingModule } from "@angular/common/http/testing";
import { HttpClient, HttpHeaders, HttpResponse } from "@angular/common/http";
import { ActivatedRoute, Router } from "@angular/router";
import { ArtifactDefaultService, ArtifactService } from "../../../artifact.service";
import {
Label,
LabelDefaultService,
LabelService,
ProjectDefaultService,
ProjectService,
ScanningResultDefaultService,
@ -31,6 +28,8 @@ import { OperationService } from "../../../../../../../shared/components/operati
import { ArtifactService as NewArtifactService } from "../../../../../../../../../ng-swagger-gen/services/artifact.service";
import { Tag } from "../../../../../../../../../ng-swagger-gen/models/tag";
import { SharedTestingModule } from "../../../../../../../shared/shared.module";
import { LabelService } from "../../../../../../../../../ng-swagger-gen/services/label.service";
import { Registry } from "../../../../../../../../../ng-swagger-gen/models/registry";
describe("ArtifactListTabComponent (inline template)", () => {
@ -297,8 +296,6 @@ describe("ArtifactListTabComponent (inline template)", () => {
TestBed.configureTestingModule({
imports: [
SharedTestingModule,
BrowserAnimationsModule,
HttpClientTestingModule,
],
schemas: [
CUSTOM_ELEMENTS_SCHEMA
@ -318,7 +315,6 @@ describe("ArtifactListTabComponent (inline template)", () => {
{ provide: ArtifactService, useValue: mockNewArtifactService },
{ provide: ProjectService, useClass: ProjectDefaultService },
{ provide: ScanningResultService, useClass: ScanningResultDefaultService },
{ provide: LabelService, useClass: LabelDefaultService },
{ provide: UserPermissionService, useClass: UserPermissionDefaultService },
{ provide: ErrorHandler, useValue: mockErrorHandler },
{ provide: ActivatedRoute, useValue: mockActivatedRoute },
@ -350,8 +346,14 @@ describe("ArtifactListTabComponent (inline template)", () => {
mockHasDeleteImagePermission, mockHasScanImagePermission]));
labelService = fixture.debugElement.injector.get(LabelService);
spyLabels = spyOn(labelService, "getGLabels").and.returnValues(of(mockLabels).pipe(delay(0)));
spyLabels1 = spyOn(labelService, "getPLabels").withArgs(comp.projectId).and.returnValues(of(mockLabels1).pipe(delay(0)));
const response: HttpResponse<Array<Registry>> = new HttpResponse<Array<Registry>>({
headers: new HttpHeaders({'x-total-count': [].length.toString()}),
body: mockLabels
});
spyLabels = spyOn(labelService, "ListLabelsResponse").and.returnValues(
of(response).pipe(delay(0))
);
spyLabels1 = spyOn(labelService, "ListLabels").withArgs(comp.projectId).and.returnValues(of(mockLabels1).pipe(delay(0)));
fixture.detectChanges();
});

86
src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts
View File

@ -26,7 +26,7 @@ import { ClrLoadingState, ClrDatagridStateInterface, ClrDatagridComparatorInterf
import { ActivatedRoute, Router } from "@angular/router";
import {
Comparator, Label, LabelService, ScanningResultService,
Comparator, ScanningResultService,
UserPermissionService, USERSTATICPERMISSION,
} from "../../../../../../../shared/services";
import {
@ -69,6 +69,8 @@ import { ConfirmationDialogComponent } from "../../../../../../../shared/compone
import { ConfirmationMessage } from "../../../../../../global-confirmation-dialog/confirmation-message";
import { ConfirmationAcknowledgement } from "../../../../../../global-confirmation-dialog/confirmation-state-message";
import { UN_LOGGED_PARAM } from "../../../../../../../account/sign-in/sign-in.service";
import { Label } from "../../../../../../../../../ng-swagger-gen/models/label";
import { LabelService } from "../../../../../../../../../ng-swagger-gen/services/label.service";
export interface LabelState {
iconsShow: boolean;
@ -77,6 +79,7 @@ export interface LabelState {
}
export const AVAILABLE_TIME = '0001-01-01T00:00:00.000Z';
const YES: string = 'yes';
const PAGE_SIZE: number = 100;
@Component({
selector: 'artifact-list-tab',
templateUrl: './artifact-list-tab.component.html',
@ -446,15 +449,86 @@ export class ArtifactListTabComponent implements OnInit, OnDestroy {
});
}
getAllLabels(): void {
forkJoin(this.labelService.getGLabels(), this.labelService.getPLabels(this.projectId)).subscribe(results => {
results.forEach(labels => {
labels.forEach(data => {
// get all project labels
this.labelService.ListLabelsResponse({
pageSize: PAGE_SIZE,
page: 1,
scope: 'p',
projectId: this.projectId
}).subscribe(res => {
if (res.headers) {
const xHeader: string = res.headers.get("X-Total-Count");
const totalCount = parseInt(xHeader, 0);
let arr = res.body || [];
if (totalCount <= PAGE_SIZE) { // already gotten all project labels
if (arr && arr.length) {
arr.forEach(data => {
this.imageLabels.push({ 'iconsShow': false, 'label': data, 'show': true });
});
});
this.imageFilterLabels = clone(this.imageLabels);
this.imageStickLabels = clone(this.imageLabels);
}, error => this.errorHandlerService.error(error));
}
} else { // get all the project labels in specified times
const times: number = Math.ceil(totalCount / PAGE_SIZE);
const observableList: Observable<Label[]>[] = [];
for (let i = 2; i <= times; i++) {
observableList.push(this.labelService.ListLabels({
page: i,
pageSize: PAGE_SIZE,
scope: 'p',
projectId: this.projectId
}));
}
this.handleLabelRes(observableList, arr);
}
}
});
// get all global labels
this.labelService.ListLabelsResponse({
pageSize: PAGE_SIZE,
page: 1,
scope: 'g',
}).subscribe(res => {
if (res.headers) {
const xHeader: string = res.headers.get("X-Total-Count");
const totalCount = parseInt(xHeader, 0);
let arr = res.body || [];
if (totalCount <= PAGE_SIZE) { // already gotten all global labels
if (arr && arr.length) {
arr.forEach(data => {
this.imageLabels.push({ 'iconsShow': false, 'label': data, 'show': true });
});
this.imageFilterLabels = clone(this.imageLabels);
this.imageStickLabels = clone(this.imageLabels);
}
} else { // get all the global labels in specified times
const times: number = Math.ceil(totalCount / PAGE_SIZE);
const observableList: Observable<Label[]>[] = [];
for (let i = 2; i <= times; i++) {
observableList.push(this.labelService.ListLabels({
page: i,
pageSize: PAGE_SIZE,
scope: 'g',
}));
}
this.handleLabelRes(observableList, arr);
}
}
});
}
handleLabelRes(observableList: Observable<Label[]>[], arr: Label[]) {
forkJoin(observableList).subscribe(response => {
if (response && response.length) {
response.forEach(item => {
arr = arr.concat(item);
});
arr.forEach(data => {
this.imageLabels.push({ 'iconsShow': false, 'label': data, 'show': true });
});
this.imageFilterLabels = clone(this.imageLabels);
this.imageStickLabels = clone(this.imageLabels);
}
});
}
labelSelectedChange(artifact?: Artifact[]): void {

28
src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.ts
View File

@ -19,26 +19,20 @@ import {
Input,
OnInit,
ViewChild,
ChangeDetectionStrategy,
ChangeDetectorRef
} from "@angular/core";
import { Label } from "../../../services/interface";
import { clone, compareValue } from "../../../units/utils";
import { LabelService } from "../../../services/label.service";
import { ErrorHandler } from "../../../units/error-handler/error-handler";
import { ErrorHandler } from "../../../units/error-handler";
import { NgForm } from "@angular/forms";
import { Subject } from "rxjs";
import { debounceTime } from "rxjs/operators";
import { LabelColor } from "../../../entities/shared.const";
import { Label } from "../../../../../../ng-swagger-gen/models/label";
import { LabelService } from "../../../../../../ng-swagger-gen/services/label.service";
@Component({
selector: "hbr-create-edit-label",
templateUrl: "./create-edit-label.component.html",
styleUrls: ["./create-edit-label.component.scss"],
changeDetection: ChangeDetectionStrategy.Default
})
export class CreateEditLabelComponent implements OnInit, OnDestroy {
formShow: boolean;
@ -61,12 +55,15 @@ export class CreateEditLabelComponent implements OnInit, OnDestroy {
constructor(
private labelService: LabelService,
private errorHandler: ErrorHandler,
private ref: ChangeDetectorRef
) {}
ngOnInit(): void {
this.nameChecker.pipe(debounceTime(500)).subscribe((name: string) => {
this.labelService.getLabels(this.scope, this.projectId, name)
this.labelService.ListLabels({
scope: this.scope,
projectId: this.projectId,
name: name
})
.subscribe(targets => {
this.isLabelNameExist = false;
if (targets && targets.length) {
@ -79,8 +76,6 @@ export class CreateEditLabelComponent implements OnInit, OnDestroy {
}, error => {
this.errorHandler.error(error);
});
let hnd = setInterval(() => this.ref.markForCheck(), 100);
setTimeout(() => clearInterval(hnd), 5000);
});
}
@ -142,7 +137,7 @@ export class CreateEditLabelComponent implements OnInit, OnDestroy {
if (this.labelId <= 0) {
this.labelModel.scope = this.scope;
this.labelModel.project_id = this.projectId;
this.labelService.createLabel(this.labelModel)
this.labelService.CreateLabel(this.labelModel)
.subscribe(res => {
this.inProgress = false;
this.reload.emit();
@ -153,7 +148,10 @@ export class CreateEditLabelComponent implements OnInit, OnDestroy {
this.errorHandler.error(err);
});
} else {
this.labelService.updateLabel(this.labelId, this.labelModel)
this.labelService.UpdateLabel({
labelId: this.labelId,
label: this.labelModel
})
.subscribe(res => {
this.inProgress = false;
this.reload.emit();

2
src/portal/src/app/shared/components/label/label-piece/label-piece.component.ts
View File

@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { Component, Input, OnInit, OnChanges } from '@angular/core';
import { Label } from "../../../services";
import { LabelColor } from "../../../entities/shared.const";
import { Label } from "../../../../../../ng-swagger-gen/models/label";
@Component({

14
src/portal/src/app/shared/components/label/label.component.html
View File

@ -17,12 +17,12 @@
<hbr-create-edit-label [scope]="scope" [projectId]="projectId" (reload)="reload()"></hbr-create-edit-label>
</div>
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selectedRow" (clrDgSelectedChange)="selectedChange()">
<clr-dg-column [clrDgField]="'name'">{{'LABEL.LABEL' | translate}}</clr-dg-column>
<clr-dg-column [clrDgField]="'description'">{{'LABEL.DESCRIPTION' | translate}}</clr-dg-column>
<clr-datagrid (clrDgRefresh)="retrieve($event)" [clrDgLoading]="loading" [(clrDgSelected)]="selectedRow">
<clr-dg-column [clrDgSortBy]="'name'">{{'LABEL.LABEL' | translate}}</clr-dg-column>
<clr-dg-column>{{'LABEL.DESCRIPTION' | translate}}</clr-dg-column>
<clr-dg-column [clrDgSortBy]="'creation_time'">{{'LABEL.CREATION_TIME' | translate }}</clr-dg-column>
<clr-dg-placeholder>{{'LABEL.PLACEHOLDER' | translate }}</clr-dg-placeholder>
<clr-dg-row *clrDgItems="let label of targets" [clrDgItem]='label'>
<clr-dg-row *ngFor="let label of targets" [clrDgItem]='label'>
<clr-dg-cell>
<hbr-label-piece [label]="label"></hbr-label-piece>
</clr-dg-cell>
@ -30,10 +30,10 @@
<clr-dg-cell>{{label.creation_time | harborDatetime: 'short'}}</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="15">
<clr-dg-pagination #pagination [clrDgPageSize]="pageSize" [(clrDgPage)]="page" [clrDgTotalItems]="total">
<clr-dg-page-size [clrPageSizeOptions]="[15,25,50]">{{"PAGINATION.PAGE_SIZE" | translate}}</clr-dg-page-size>
<span *ngIf="targets?.length">{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'DESTINATION.OF' | translate}}</span>
{{targets?.length}} {{'DESTINATION.ITEMS' | translate}}
<span *ngIf="total">{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'DESTINATION.OF' | translate}}</span>
{{total}} {{'DESTINATION.ITEMS' | translate}}
</clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

20
src/portal/src/app/shared/components/label/label.component.spec.ts
View File

@ -1,18 +1,18 @@
import { Label } from "../../services";
import { LabelComponent } from "./label.component";
import { waitForAsync, ComponentFixture, TestBed } from "@angular/core/testing";
import { LabelDefaultService, LabelService } from "../../services";
import { NoopAnimationsModule } from "@angular/platform-browser/animations";
import { FilterComponent } from "../filter/filter.component";
import { ConfirmationDialogComponent } from "../confirmation-dialog";
import { CreateEditLabelComponent } from "./create-edit-label/create-edit-label.component";
import { LabelPieceComponent } from "./label-piece/label-piece.component";
import { InlineAlertComponent } from "../inline-alert/inline-alert.component";
import { ErrorHandler } from "../../units/error-handler";
import { OperationService } from "../operation/operation.service";
import { of } from "rxjs";
import { CURRENT_BASE_HREF } from "../../units/utils";
import { delay } from "rxjs/operators";
import { SharedTestingModule } from "../../shared.module";
import { LabelService } from "../../../../../ng-swagger-gen/services/label.service";
import { HttpHeaders, HttpResponse } from "@angular/common/http";
import { Registry } from "../../../../../ng-swagger-gen/models/registry";
describe('LabelComponent (inline template)', () => {
@ -56,12 +56,10 @@ describe('LabelComponent (inline template)', () => {
let labelService: LabelService;
let spy: jasmine.Spy;
let spyOneLabel: jasmine.Spy;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
SharedTestingModule,
NoopAnimationsModule
],
declarations: [
FilterComponent,
@ -72,8 +70,6 @@ describe('LabelComponent (inline template)', () => {
InlineAlertComponent
],
providers: [
ErrorHandler,
{provide: LabelService, useClass: LabelDefaultService},
{provide: OperationService}
]
});
@ -84,9 +80,11 @@ describe('LabelComponent (inline template)', () => {
comp = fixture.componentInstance;
labelService = fixture.debugElement.injector.get(LabelService);
spy = spyOn(labelService, 'getLabels').and.returnValues(of(mockData));
spyOneLabel = spyOn(labelService, 'getLabel').and.returnValues(of(mockOneData));
const response: HttpResponse<Array<Registry>> = new HttpResponse<Array<Registry>>({
headers: new HttpHeaders({'x-total-count': [].length.toString()}),
body: mockData
});
spy = spyOn(labelService, 'ListLabelsResponse').and.returnValues(of(response).pipe(delay(0)));
fixture.detectChanges();
});

75
src/portal/src/app/shared/components/label/label.component.ts
View File

@ -17,8 +17,6 @@ import {
ViewChild,
Input
} from "@angular/core";
import { Label } from "../../services";
import { LabelService } from "../../services";
import { ErrorHandler } from "../../units/error-handler";
import { CreateEditLabelComponent } from "./create-edit-label/create-edit-label.component";
import {
@ -35,6 +33,10 @@ import { Observable, throwError as observableThrowError, forkJoin } from "rxjs";
import { errorHandler } from "../../units/shared.utils";
import { ConfirmationMessage } from "../../../base/global-confirmation-dialog/confirmation-message";
import { ConfirmationAcknowledgement } from "../../../base/global-confirmation-dialog/confirmation-state-message";
import { LabelService } from "../../../../../ng-swagger-gen/services/label.service";
import { Label } from "../../../../../ng-swagger-gen/models/label";
import { DEFAULT_PAGE_SIZE, getSortingString } from "../../units/utils";
import { ClrDatagridStateInterface } from "@clr/angular";
@Component({
selector: "hbr-label",
templateUrl: "./label.component.html",
@ -42,7 +44,7 @@ import { ConfirmationAcknowledgement } from "../../../base/global-confirmation-d
})
export class LabelComponent implements OnInit {
timerHandler: any;
loading: boolean;
loading: boolean = true;
targets: Label[];
targetName: string;
selectedRow: Label[] = [];
@ -58,6 +60,9 @@ export class LabelComponent implements OnInit {
@ViewChild("confirmationDialog")
confirmationDialogComponent: ConfirmationDialogComponent;
page: number = 1;
pageSize: number = DEFAULT_PAGE_SIZE;
total: number = 0;
constructor(private labelService: LabelService,
private errorHandlerEntity: ErrorHandler,
private translateService: TranslateService,
@ -65,18 +70,40 @@ export class LabelComponent implements OnInit {
}
ngOnInit(): void {
this.retrieve(this.scope);
}
retrieve(scope: string, name = "") {
this.loading = true;
retrieve(state?: ClrDatagridStateInterface) {
this.selectedRow = [];
this.targetName = "";
this.labelService.getLabels(scope, this.projectId, name).pipe(finalize(() => {
// this.targetName = "";
if (state && state.page) {
this.pageSize = state.page.size;
}
let sort: string;
if (state && state.sort && state.sort.by) {
sort = getSortingString(state);
} else { // sort by creation_time desc by default
sort = `-creation_time`;
}
this.loading = true;
this.labelService.ListLabelsResponse({
page: this.page,
pageSize: this.pageSize,
name: this.targetName,
sort: sort,
scope: this.scope,
projectId: this.projectId
}).pipe(finalize(() => {
this.loading = false;
}))
.subscribe(targets => {
this.targets = targets || [];
.subscribe(res => {
// Get total count
if (res.headers) {
let xHeader: string = res.headers.get("X-Total-Count");
if (xHeader) {
this.total = parseInt(xHeader, 0);
}
}
this.targets = res.body || [];
}, error => {
this.errorHandlerEntity.error(error);
});
@ -87,21 +114,28 @@ export class LabelComponent implements OnInit {
}
reload(): void {
this.retrieve(this.scope);
this.targetName = "";
this.page = 1;
this.total = 0;
this.selectedRow = [];
this.retrieve();
}
doSearchTargets(targetName: string) {
this.retrieve(this.scope, targetName);
this.targetName = targetName;
this.page = 1;
this.total = 0;
this.selectedRow = [];
this.retrieve();
}
refreshTargets() {
this.retrieve(this.scope);
this.targetName = "";
this.page = 1;
this.total = 0;
this.selectedRow = [];
this.retrieve();
}
selectedChange(): void {
// this.forceRefreshView(5000);
}
editLabel(label: Label[]): void {
this.createEditLabel.editModel(label[0].id, label);
}
@ -134,8 +168,7 @@ export class LabelComponent implements OnInit {
observableLists.push(this.delOperate(target));
});
forkJoin(...observableLists).subscribe((item) => {
this.selectedRow = [];
this.retrieve(this.scope);
this.reload();
}, error => {
this.errorHandlerEntity.error(error);
});
@ -153,7 +186,7 @@ export class LabelComponent implements OnInit {
this.operationService.publishInfo(operMessage);
return this.labelService
.deleteLabel(target.id)
.DeleteLabel(target.id)
.pipe(map(
response => {
this.translateService.get('BATCH.DELETED_SUCCESS')