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

Merge pull request #8720 from jwangyangls/fix-quota-bug

Browse Source 
Fix bug for harbor 1.9.0
This commit is contained in:
jwangyangls 2019-08-19 11:20:25 +08:00 committed by GitHub
commit 94c930f150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 89 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.scss
View File

@ -78,4 +78,7 @@
width: 3.5rem;
font-weight: 100;
font-size: 10px;
overflow: hidden;
text-overflow: ellipsis;
}

10
src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.ts
View File

@ -11,7 +11,7 @@ import { InlineAlertComponent } from '../../../inline-alert/inline-alert.compone
import { QuotaUnits, QuotaUnlimited, QUOTA_DANGER_COEFFICIENT, QUOTA_WARNING_COEFFICIENT } from "../../../shared/shared.const";
import { clone, getSuitableUnit, getByte, GetIntegerAndUnit, validateLimit } from '../../../utils';
import { clone, getSuitableUnit, getByte, GetIntegerAndUnit, validateCountLimit, validateLimit } from '../../../utils';
import { EditQuotaQuotaInterface, QuotaHardLimitInterface } from '../../../service';
import { distinctUntilChanged } from 'rxjs/operators';
@ -103,10 +103,16 @@ export class EditProjectQuotasComponent implements OnInit {
Validators.pattern('(^-1$)|(^([1-9]+)([0-9]+)*$)'),
validateLimit(this.currentForm.form.controls['storageUnit'])
]);
this.currentForm.form.controls['count'].setValidators(
[
Validators.required,
Validators.pattern('(^-1$)|(^([1-9]+)([0-9]+)*$)'),
validateCountLimit()
]);
this.currentForm.form.valueChanges
.pipe(distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)))
.subscribe((data) => {
['storage', 'storageUnit'].forEach(fieldName => {
['storage', 'storageUnit', 'count'].forEach(fieldName => {
if (this.currentForm.form.get(fieldName) && this.currentForm.form.get(fieldName).value !== null) {
this.currentForm.form.get(fieldName).updateValueAndValidity();
}

2
src/portal/lib/src/create-edit-rule/create-edit-rule.component.ts
View File

@ -434,7 +434,7 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
// get supportedFilterLabels labels from supportedFilters
this.getLabelListFromAdapter(element);
// only when edit replication rule
if (ruleInfo && this.supportedFilterLabels.length) {
if (ruleInfo && ruleInfo.filters && this.supportedFilterLabels.length ) {
this.getLabelListFromRuleInfo(ruleInfo);
}
});

1
src/portal/lib/src/shared/shared.const.ts
View File

@ -90,6 +90,7 @@ export const QuotaUnits = [
];
export const QuotaUnlimited = -1;
export const StorageMultipleConstant = 1024;
export const LimitCount = 100000000;
export enum QuotaUnit {
TB = "TB", GB = "GB", MB = "MB", KB = "KB", BIT = "Byte"
}

38
src/portal/lib/src/utils.ts
View File

@ -4,8 +4,9 @@ import { HttpHeaders } from '@angular/common/http';
import { RequestQueryParams } from './service/RequestQueryParams';
import { DebugElement } from '@angular/core';
import { Comparator, State, HttpOptionInterface, HttpOptionTextInterface, QuotaUnitInterface } from './service/interface';
import { QuotaUnits, StorageMultipleConstant } from './shared/shared.const';
import { QuotaUnits, StorageMultipleConstant, LimitCount } from './shared/shared.const';
import { AbstractControl } from "@angular/forms";
/**
* Convert the different async channels to the Promise<T> type.
*
@ -504,15 +505,30 @@ export const GetIntegerAndUnit = (hardNumber: number, quotaUnitsDeep: QuotaUnitI
}
}
};
export const validateLimit = (unitContrl) => {
return (control: AbstractControl) => {
if (getByte(control.value, unitContrl.value) > StorageMultipleConstant * StorageMultipleConstant
* StorageMultipleConstant * StorageMultipleConstant * StorageMultipleConstant) {
return {
error: true
};
}
return null;
};
export const validateCountLimit = () => {
return (control: AbstractControl) => {
if (control.value > LimitCount) {
return {
error: true
};
}
return null;
};
};
export const validateLimit = unitContrl => {
return (control: AbstractControl) => {
if (
// 1024TB
getByte(control.value, unitContrl.value) >
Math.pow(StorageMultipleConstant, 5)
) {
return {
error: true
};
}
return null;
};
};

18
src/portal/src/app/project/create-project/create-project.component.html
View File

@ -35,11 +35,11 @@
</div>
<div class="form-group" *ngIf="isSystemAdmin">
<label for="create_project_count-limit" class="required col-md-3 form-group-label-override">{{'PROJECT.COUNT_QUOTA' | translate}}</label>
<label for="create_project_count-limit" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-left"
<label for="create_project_count_limit" class="required col-md-3 form-group-label-override">{{'PROJECT.COUNT_QUOTA' | translate}}</label>
<label for="create_project_count_limit" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-left"
[class.invalid]="projectCountLimit.invalid && (projectCountLimit.dirty || projectCountLimit.touched)" >
<input type="text" id="create_project_count-limit" [(ngModel)]="countLimit"
name="create_project_count-limit" class="input-width"
<input type="text" id="create_project_count_limit" [(ngModel)]="countLimit"
name="create_project_count_limit" class="input-width"
pattern="(^-1$)|(^([1-9]+)([0-9]+)*$)"
required
#projectCountLimit="ngModel"
@ -56,18 +56,18 @@
</div>
</div>
<div class="form-group" *ngIf="isSystemAdmin">
<label for="create_project_storage-limit" class="required col-md-3 form-group-label-override">{{'PROJECT.STORAGE_QUOTA' | translate}}</label>
<label for="create_project_storage-limit" aria-haspopup="true" role="tooltip" class="tooltip-quota-storage tooltip tooltip-validation tooltip-md tooltip-top-left"
<label for="create_project_storage_limit" class="required col-md-3 form-group-label-override">{{'PROJECT.STORAGE_QUOTA' | translate}}</label>
<label for="create_project_storage_limit" aria-haspopup="true" role="tooltip" class="tooltip-quota-storage tooltip tooltip-validation tooltip-md tooltip-top-left"
[class.invalid]="(projectStorageLimit.invalid && (projectStorageLimit.dirty || projectStorageLimit.touched))||projectStorageLimit.errors" >
<input type="text" id="create_project_storage-limit" [(ngModel)]="storageLimit"
name="create_project_storage-limit" size="255" class="input-width"
<input type="text" id="create_project_storage_limit" [(ngModel)]="storageLimit"
name="create_project_storage_limit" size="255" class="input-width"
#projectStorageLimit="ngModel"
autocomplete="off" >
<span class="tooltip-content">
{{ 'PROJECT.STORAGE_QUOTA_TIP' | translate }}
</span>
</label>
<select clrSelect id="create_project_storage-limit-unit" name="create_project_storage-limit-unit" [(ngModel)]="storageLimitUnit">
<select clrSelect id="create_project_storage_limit_unit" name="create_project_storage_limit_unit" [(ngModel)]="storageLimitUnit">
<ng-template ngFor let-quotaUnit [ngForOf]="quotaUnits" let-i="index">
<option *ngIf="i>1"[value]="quotaUnit.UNIT">{{ quotaUnit.UNIT }}</option>
</ng-template>

14
src/portal/src/app/project/create-project/create-project.component.ts
View File

@ -34,7 +34,7 @@ import { InlineAlertComponent } from "../../shared/inline-alert/inline-alert.com
import { Project } from "../project";
import { ProjectService, QuotaUnits, QuotaHardInterface, QuotaUnlimited, getByte
, GetIntegerAndUnit, clone, StorageMultipleConstant, validateLimit} from "@harbor/ui";
, GetIntegerAndUnit, clone, StorageMultipleConstant, validateLimit, validateCountLimit} from "@harbor/ui";
import { errorHandler } from '@angular/platform-browser/src/browser';
@Component({
@ -118,17 +118,23 @@ export class CreateProjectComponent implements OnInit, OnChanges, OnDestroy {
this.storageDefaultLimit = this.storageLimit;
this.storageDefaultLimitUnit = this.storageLimitUnit;
if (this.isSystemAdmin) {
this.currentForm.form.controls['create_project_storage-limit'].setValidators(
this.currentForm.form.controls['create_project_storage_limit'].setValidators(
[
Validators.required,
Validators.pattern('(^-1$)|(^([1-9]+)([0-9]+)*$)'),
validateLimit(this.currentForm.form.controls['create_project_storage-limit-unit'])
validateLimit(this.currentForm.form.controls['create_project_storage_limit_unit'])
]);
this.currentForm.form.controls['create_project_count_limit'].setValidators(
[
Validators.required,
Validators.pattern('(^-1$)|(^([1-9]+)([0-9]+)*$)'),
validateCountLimit()
]);
}
this.currentForm.form.valueChanges
.pipe(distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)))
.subscribe((data) => {
['create_project_storage-limit', 'create_project_storage-limit-unit'].forEach(fieldName => {
['create_project_storage_limit', 'create_project_storage_limit_unit', 'create_project_count_limit'].forEach(fieldName => {
if (this.currentForm.form.get(fieldName) && this.currentForm.form.get(fieldName).value !== null) {
this.currentForm.form.get(fieldName).updateValueAndValidity();
}

15
src/portal/src/app/project/summary/summary.component.scss
View File

@ -36,4 +36,19 @@
progress {
max-height: 0.48rem;
}
}
::ng-deep {
.progress {
&.warning>progress {
color: orange;
&::-webkit-progress-value {
background-color: orange;
}
&::-moz-progress-bar {
background-color: orange;
}
}
}
}

6
src/portal/src/i18n/lang/en-us-lang.json
View File

@ -226,9 +226,9 @@
"OF": "of",
"COUNT_QUOTA": "Count quota",
"STORAGE_QUOTA": "Storage quota",
"COUNT_QUOTA_TIP": "The upper limit of Count Quota should be integers.",
"STORAGE_QUOTA_TIP": "The upper limit of Storage Quota should be integers,and maximum upper limit is 1024TB",
"QUOTA_UNLIMIT_TIP": "If you want to unlimited this quota, please input -1."
"COUNT_QUOTA_TIP": "Please enter an integer between '1' & '100,000,000', '-1' for unlimited.",
"STORAGE_QUOTA_TIP": "The upper limit of Storage Quota only takes integer values, capped at '1024TB'. Enter '-1' for unlimited quota",
"QUOTA_UNLIMIT_TIP": "For unlimited quota, please enter '-1'."
},
"PROJECT_DETAIL": {
"SUMMARY": "Summary",

6
src/portal/src/i18n/lang/es-es-lang.json
View File

@ -227,9 +227,9 @@
"OF": "of",
"COUNT_QUOTA": "Count quota",
"STORAGE_QUOTA": "Storage quota",
"COUNT_QUOTA_TIP": "The upper limit of Count Quota should be integers.",
"STORAGE_QUOTA_TIP": "The upper limit of Storage Quota should be integers,and maximum upper limit is 1024TB",
"QUOTA_UNLIMIT_TIP": "If you want to unlimited this quota, please input -1."
"COUNT_QUOTA_TIP": "Please enter an integer between '1' & '100,000,000', '-1' for unlimited",
"STORAGE_QUOTA_TIP": "The upper limit of Storage Quota only takes integer values, capped at '1024TB'. Enter '-1' for unlimited quota",
"QUOTA_UNLIMIT_TIP": "For unlimited quota, please enter '-1'."
},
"PROJECT_DETAIL": {
"SUMMARY": "Summary",

6
src/portal/src/i18n/lang/fr-fr-lang.json
View File

@ -220,9 +220,9 @@
"OF": "de",
"COUNT_QUOTA": "Count quota",
"STORAGE_QUOTA": "Storage quota",
"COUNT_QUOTA_TIP": "The upper limit of Count Quota should be integers.",
"STORAGE_QUOTA_TIP": "The upper limit of Storage Quota should be integers,and maximum upper limit is 1024TB",
"QUOTA_UNLIMIT_TIP": "If you want to unlimited this quota, please input -1."
"COUNT_QUOTA_TIP": "Please enter an integer between '1' & '100,000,000', '-1' for unlimited",
"STORAGE_QUOTA_TIP": "The upper limit of Storage Quota only takes integer values, capped at '1024TB'. Enter '-1' for unlimited quota",
"QUOTA_UNLIMIT_TIP": "For unlimited quota, please enter '-1'."
},
"PROJECT_DETAIL": {
"SUMMARY": "Summary",

6
src/portal/src/i18n/lang/pt-br-lang.json
View File

@ -224,9 +224,9 @@
"OF": "de",
"COUNT_QUOTA": "Count quota",
"STORAGE_QUOTA": "Storage quota",
"COUNT_QUOTA_TIP": "The upper limit of Count Quota should be integers.",
"STORAGE_QUOTA_TIP": "The upper limit of Storage Quota should be integers,and maximum upper limit is 1024TB",
"QUOTA_UNLIMIT_TIP": "If you want to unlimited this quota, please input -1."
"COUNT_QUOTA_TIP": "Please enter an integer between '1' & '100,000,000', '-1' for unlimited",
"STORAGE_QUOTA_TIP": "The upper limit of Storage Quota only takes integer values, capped at '1024TB'. Enter '-1' for unlimited quota",
"QUOTA_UNLIMIT_TIP": "For unlimited quota, please enter '-1'."
},
"PROJECT_DETAIL": {
"SUMMARY": "Summary",

6
src/portal/src/i18n/lang/zh-cn-lang.json
View File

@ -225,9 +225,9 @@
"INLINE_HELP_PUBLIC": "当项目设为公开后，任何人都有此项目下镜像的读权限。命令行用户不需要“docker login”就可以拉取此项目下的镜像。",
"COUNT_QUOTA": "存储数量",
"STORAGE_QUOTA": "存储容量",
"COUNT_QUOTA_TIP": "存储数量上限应该是整数.",
"STORAGE_QUOTA_TIP": "存储容量的上限应该设置成为整数.并且最大值不能超过1024TB",
"QUOTA_UNLIMIT_TIP": "如果你想要对存储不设置上限，请输入-1."
"COUNT_QUOTA_TIP": "请输入一个'1' ~ '100000000'之间的整数, '-1'表示不设置上限。",
"STORAGE_QUOTA_TIP": "存储配额的上限仅采用整数值，上限为1024TB。输入“-1”作为无限制配额。",
"QUOTA_UNLIMIT_TIP": "如果你想要对存储不设置上限，请输入-1。"
},
"PROJECT_DETAIL": {
"SUMMARY": "概要",