Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-30 08:45:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6246 from zhoumeina/refactor_registry_for_admiral

Browse Source 
Refactor registry for admiral
This commit is contained in:
Qian Deng 2018-11-09 13:48:43 +08:00 committed by GitHub
commit 6a3fe60d55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/lib/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@harbor/ui", "name": "@harbor/ui",
"version": "1.0.0-rc6", "version": "1.0.0-rc7",
"description": "Harbor shared UI components based on Clarity and Angular6", "description": "Harbor shared UI components based on Clarity and Angular6",
"author": "CNCF", "author": "CNCF",
"module": "index.js", "module": "index.js",

26
src/portal/lib/src/config/registry-config.component.html
View File

@ -1,9 +1,17 @@
<div> <clr-tabs>
<system-settings #systemSettings [(systemSettings)]="config" [showSubTitle]="true" [hasAdminRole]="hasAdminRole" [hasCAFile]="hasCAFile" [withAdmiral]="withAdmiral"></system-settings> <clr-tab>
<vulnerability-config *ngIf="withClair" #vulnerabilityConfig [(vulnerabilityConfig)]="config" [showSubTitle]="true"></vulnerability-config> <button id="config-system" clrTabLink>{{'CONFIG.SYSTEM' | translate}}</button>
<div> <clr-tab-content id="system_settings" *clrIfActive>
<button type="button" class="btn btn-primary" (click)="save()" [disabled]="shouldDisable">{{'BUTTON.SAVE' | translate}}</button> <system-settings #systemSettings [(systemSettings)]="config" [showSubTitle]="true" [hasAdminRole]="hasAdminRole" [hasCAFile]="hasCAFile"
<button type="button" class="btn btn-outline" (click)="cancel()" [disabled]="shouldDisable">{{'BUTTON.CANCEL' | translate}}</button> [withAdmiral]="withAdmiral">
</div> </system-settings>
<confirmation-dialog #cfgConfirmationDialog (confirmAction)="confirmCancel($event)"></confirmation-dialog> </clr-tab-content>
</div> </clr-tab>
<clr-tab>
<button id="config-vulnerability" clrTabLink>{{'CONFIG.VULNERABILITY' | translate}}</button>
<clr-tab-content id="vulnerability" *clrIfActive>
<vulnerability-config *ngIf="withClair" #vulnerabilityConfig [(vulnerabilityConfig)]="config" [showSubTitle]="true"></vulnerability-config>
</clr-tab-content>
</clr-tab>
</clr-tabs>
<confirmation-dialog #cfgConfirmationDialog (confirmAction)="confirmCancel($event)"></confirmation-dialog>

12
src/portal/lib/src/config/registry-config.component.spec.ts
View File

@ -27,7 +27,6 @@ describe('RegistryConfigComponent (inline template)', () => {
let cfgService: ConfigurationService; let cfgService: ConfigurationService;
let systemInfoService: SystemInfoService; let systemInfoService: SystemInfoService;
let spy: jasmine.Spy; let spy: jasmine.Spy;
let saveSpy: jasmine.Spy;
let spySystemInfo: jasmine.Spy; let spySystemInfo: jasmine.Spy;
let mockConfig: Configuration = new Configuration(); let mockConfig: Configuration = new Configuration();
mockConfig.token_expiration.value = 90; mockConfig.token_expiration.value = 90;
@ -82,7 +81,6 @@ describe('RegistryConfigComponent (inline template)', () => {
cfgService = fixture.debugElement.injector.get(ConfigurationService); cfgService = fixture.debugElement.injector.get(ConfigurationService);
systemInfoService = fixture.debugElement.injector.get(SystemInfoService); systemInfoService = fixture.debugElement.injector.get(SystemInfoService);
spy = spyOn(cfgService, 'getConfigurations').and.returnValue(Promise.resolve(mockConfig)); spy = spyOn(cfgService, 'getConfigurations').and.returnValue(Promise.resolve(mockConfig));
saveSpy = spyOn(cfgService, 'saveConfigurations').and.returnValue(Promise.resolve(true));
spySystemInfo = spyOn(systemInfoService, 'getSystemInfo').and.returnValue(Promise.resolve(mockSystemInfo)); spySystemInfo = spyOn(systemInfoService, 'getSystemInfo').and.returnValue(Promise.resolve(mockSystemInfo));
fixture.detectChanges(); fixture.detectChanges();
@ -102,16 +100,8 @@ describe('RegistryConfigComponent (inline template)', () => {
fixture.detectChanges(); fixture.detectChanges();
let el3: HTMLInputElement = fixture.nativeElement.querySelector('.btn-scan'); let el3: HTMLElement = fixture.nativeElement.querySelector('#config-vulnerability');
expect(el3).toBeTruthy(); expect(el3).toBeTruthy();
expect(el3).not.toBeFalsy();
}); });
})); }));
it('should save the configuration changes', async(() => {
comp.save();
fixture.detectChanges();
expect(saveSpy.calls.any).toBeTruthy();
}));
}); });

2
src/portal/lib/src/config/vulnerability/vulnerability-config.component.html
View File

@ -48,7 +48,7 @@
<button class="btn btn-primary btn-sm" (click)="cancel()" >{{'BUTTON.CANCEL' | translate}}</button> <button class="btn btn-primary btn-sm" (click)="cancel()" >{{'BUTTON.CANCEL' | translate}}</button>
</div> </div>
<div class="btn-scan-right btn-scan"> <div class="btn-scan-right btn-scan">
<button class="btn btn-primary btn-sm" (click)="scanNow()" [disabled]="!scanAvailable">{{ 'CONFIG.SCANNING.SCAN_NOW' | translate }}</button><br> <button class="btn btn-primary btn-sm btn-scan" (click)="scanNow()" [disabled]="!scanAvailable">{{ 'CONFIG.SCANNING.SCAN_NOW' | translate }}</button><br>
<span *ngIf="!scanAvailable">{{ 'CONFIG.SCANNING.NEXT_SCAN' | translate }} {{ nextScanTimestamp | date:'y/MM/dd HH:mm' }}</span> <span *ngIf="!scanAvailable">{{ 'CONFIG.SCANNING.NEXT_SCAN' | translate }} {{ nextScanTimestamp | date:'y/MM/dd HH:mm' }}</span>
</div> </div>
</section> </section>