-
+
@@ -60,8 +60,9 @@
{{'PROJECT.QUOTA_UNLIMIT_TIP' | translate }}
-
diff --git a/src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.scss b/src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.scss
index 024a058d6..43f9bf3bc 100644
--- a/src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.scss
+++ b/src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.scss
@@ -1,21 +1,25 @@
-
::ng-deep .modal-dialog {
width: 25rem;
}
+
.modal-body {
padding-top: 0.8rem;
overflow-y: visible;
overflow-x: visible;
+
.clr-form-compact {
div.form-group {
padding-left: 8.5rem;
+
.mr-3px {
margin-right: 3px;
}
+
.quota-input {
width: 2rem;
padding-right: 0.8rem;
}
+
.select-div {
width: 2.5rem;
@@ -51,6 +55,22 @@
width: 9rem;
}
+::ng-deep {
+ .progress {
+ &.warning>progress {
+ color: orange;
+
+ &::-webkit-progress-value {
+ background-color: orange;
+ }
+
+ &::-moz-progress-bar {
+ background-color: orange;
+ }
+ }
+ }
+}
+
.progress-label {
position: absolute;
right: -2.3rem;
@@ -58,4 +78,7 @@
width: 3.5rem;
font-weight: 100;
font-size: 10px;
+
+ overflow: hidden;
+ text-overflow: ellipsis;
}
\ No newline at end of file
diff --git a/src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.ts b/src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.ts
index a0e435c91..ca3248b32 100644
--- a/src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.ts
+++ b/src/portal/lib/src/config/project-quotas/edit-project-quotas/edit-project-quotas.component.ts
@@ -6,15 +6,12 @@ import {
OnInit,
} from '@angular/core';
import { NgForm, Validators } from '@angular/forms';
-import { ActivatedRoute } from "@angular/router";
-
-import { TranslateService } from '@ngx-translate/core';
import { InlineAlertComponent } from '../../../inline-alert/inline-alert.component';
-import { QuotaUnits, QuotaUnlimited } from "../../../shared/shared.const";
+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';
@@ -47,9 +44,9 @@ export class EditProjectQuotasComponent implements OnInit {
@ViewChild('quotaForm')
currentForm: NgForm;
@Output() confirmAction = new EventEmitter();
- constructor(
- private translateService: TranslateService,
- private route: ActivatedRoute) { }
+ quotaDangerCoefficient: number = QUOTA_DANGER_COEFFICIENT;
+ quotaWarningCoefficient: number = QUOTA_WARNING_COEFFICIENT;
+ constructor() { }
ngOnInit() {
}
@@ -106,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();
}
@@ -134,10 +137,18 @@ export class EditProjectQuotasComponent implements OnInit {
}
return 0;
}
- getDangerStyle(limit: number | string, used: number | string, unit?: string) {
+ isDangerColor(limit: number | string, used: number | string, unit?: string) {
if (unit) {
- return limit !== QuotaUnlimited ? +used / getByte(+limit, unit) > 0.9 : false;
+ return limit !== QuotaUnlimited ? +used / getByte(+limit, unit) >= this.quotaDangerCoefficient : false;
}
- return limit !== QuotaUnlimited ? +used / +limit > 0.9 : false;
+ return limit !== QuotaUnlimited ? +used / +limit >= this.quotaDangerCoefficient : false;
+ }
+ isWarningColor(limit: number | string, used: number | string, unit?: string) {
+ if (unit) {
+ return limit !== QuotaUnlimited ?
+ +used / getByte(+limit, unit) >= this.quotaWarningCoefficient && +used / getByte(+limit, unit) <= this.quotaDangerCoefficient : false;
+ }
+ return limit !== QuotaUnlimited ?
+ +used / +limit >= this.quotaWarningCoefficient && +used / +limit <= this.quotaDangerCoefficient : false;
}
}
diff --git a/src/portal/lib/src/config/project-quotas/project-quotas.component.html b/src/portal/lib/src/config/project-quotas/project-quotas.component.html
index 6f9e9cad2..22af1333d 100644
--- a/src/portal/lib/src/config/project-quotas/project-quotas.component.html
+++ b/src/portal/lib/src/config/project-quotas/project-quotas.component.html
@@ -37,7 +37,9 @@
+ [class.danger]="quota.hard.count!==-1?quota.used.count/quota.hard.count>quotaDangerCoefficient:false"
+ [class.warning]="quota.hard.count!==-1?quota.used.count/quota.hard.count<=quotaDangerCoefficient &"a.used.count/quota.hard.count>=quotaWarningCoefficient:false"
+ >
@@ -48,7 +50,9 @@
+ [class.danger]="quota.hard.storage!==-1?quota.used.storage/quota.hard.storage>quotaDangerCoefficient:false"
+ [class.warning]="quota.hard.storage!==-1?quota.used.storage/quota.hard.storage>=quotaWarningCoefficient&"a.used.storage/quota.hard.storage<=quotaDangerCoefficient:false"
+ >
diff --git a/src/portal/lib/src/config/project-quotas/project-quotas.component.ts b/src/portal/lib/src/config/project-quotas/project-quotas.component.ts
index df5effd32..fa457b03e 100644
--- a/src/portal/lib/src/config/project-quotas/project-quotas.component.ts
+++ b/src/portal/lib/src/config/project-quotas/project-quotas.component.ts
@@ -8,7 +8,7 @@ import {
, getByte, GetIntegerAndUnit
} from '../../utils';
import { ErrorHandler } from '../../error-handler/index';
-import { QuotaUnits, QuotaUnlimited } from '../../shared/shared.const';
+import { QuotaUnits, QuotaUnlimited, QUOTA_DANGER_COEFFICIENT, QUOTA_WARNING_COEFFICIENT } from '../../shared/shared.const';
import { EditProjectQuotasComponent } from './edit-project-quotas/edit-project-quotas.component';
import {
ConfigurationService
@@ -46,6 +46,8 @@ export class ProjectQuotasComponent implements OnChanges {
currentPage = 1;
totalCount = 0;
pageSize = 15;
+ quotaDangerCoefficient: number = QUOTA_DANGER_COEFFICIENT;
+ quotaWarningCoefficient: number = QUOTA_WARNING_COEFFICIENT;
@Input()
get allConfig(): Configuration {
return this.config;
diff --git a/src/portal/lib/src/config/system/system-settings.component.html b/src/portal/lib/src/config/system/system-settings.component.html
index 82f83f024..72b9458f6 100644
--- a/src/portal/lib/src/config/system/system-settings.component.html
+++ b/src/portal/lib/src/config/system/system-settings.component.html
@@ -95,7 +95,7 @@
-
@@ -103,13 +103,13 @@
-
{{'CVE_WHITELIST.HELP'|translate}}
-
diff --git a/src/portal/lib/src/config/system/system-settings.component.scss b/src/portal/lib/src/config/system/system-settings.component.scss
index 18a577cc3..5b708737f 100644
--- a/src/portal/lib/src/config/system/system-settings.component.scss
+++ b/src/portal/lib/src/config/system/system-settings.component.scss
@@ -27,8 +27,6 @@
width: 222px;
color: #0079bb;
overflow-y: auto;
- white-space: nowrap;
-
li {
height: 24px;
line-height: 24px;
diff --git a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.ts b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.ts
index 0508e4c14..2ecf2ffca 100644
--- a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.ts
+++ b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.ts
@@ -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);
}
});
diff --git a/src/portal/lib/src/cron-schedule/cron-schedule.component.html b/src/portal/lib/src/cron-schedule/cron-schedule.component.html
index 315560e47..5c19753d9 100644
--- a/src/portal/lib/src/cron-schedule/cron-schedule.component.html
+++ b/src/portal/lib/src/cron-schedule/cron-schedule.component.html
@@ -17,7 +17,7 @@
{{ "SCHEDULE.CRON" | translate }} :
{{ oriCron }}
-
diff --git a/src/portal/lib/src/cron-schedule/cron-schedule.component.ts b/src/portal/lib/src/cron-schedule/cron-schedule.component.ts
index ba9abae5b..bf1e764ad 100644
--- a/src/portal/lib/src/cron-schedule/cron-schedule.component.ts
+++ b/src/portal/lib/src/cron-schedule/cron-schedule.component.ts
@@ -27,6 +27,7 @@ export class CronScheduleComponent implements OnChanges {
@Input() originCron: OriginCron;
@Input() labelEdit: string;
@Input() labelCurrent: string;
+ @Input() disabled: boolean;
dateInvalid: boolean;
originScheduleType: string;
oriCron: string;
diff --git a/src/portal/lib/src/image-name-input/image-name-input.component.ts b/src/portal/lib/src/image-name-input/image-name-input.component.ts
index 30bd4e126..1a3170a62 100644
--- a/src/portal/lib/src/image-name-input/image-name-input.component.ts
+++ b/src/portal/lib/src/image-name-input/image-name-input.component.ts
@@ -52,10 +52,10 @@ export class ImageNameInputComponent implements OnInit, OnDestroy {
const prolist: any = this.proService.listProjects(name, undefined);
if (prolist.subscribe) {
prolist.subscribe(response => {
- if (response) {
- this.selectedProjectList = response.slice(0, 10);
+ if (response.body) {
+ this.selectedProjectList = response.body.slice(0, 10);
// if input project name exist in the project list
- let exist = response.find((data: any) => data.name === name);
+ let exist = response.body.find((data: any) => data.name === name);
if (!exist) {
this.noProjectInfo = "REPLICATION.NO_PROJECT_INFO";
} else {
diff --git a/src/portal/lib/src/log/recent-log.component.spec.ts b/src/portal/lib/src/log/recent-log.component.spec.ts
index 39425c8b2..bdb7cc4c0 100644
--- a/src/portal/lib/src/log/recent-log.component.spec.ts
+++ b/src/portal/lib/src/log/recent-log.component.spec.ts
@@ -203,7 +203,7 @@ describe('RecentLogComponent (inline template)', () => {
fixture.detectChanges();
expect(component.recentLogs).toBeTruthy();
expect(component.logsCache).toBeTruthy();
- expect(component.recentLogs.length).toEqual(3);
+ expect(component.recentLogs.length).toEqual(15);
});
});
diff --git a/src/portal/lib/src/log/recent-log.component.ts b/src/portal/lib/src/log/recent-log.component.ts
index b791e7bfb..8a187c9df 100644
--- a/src/portal/lib/src/log/recent-log.component.ts
+++ b/src/portal/lib/src/log/recent-log.component.ts
@@ -67,7 +67,8 @@ export class RecentLogComponent implements OnInit {
}
public doFilter(terms: string): void {
- if (!terms) {
+ // allow search by null characters
+ if (terms === undefined || terms === null) {
return;
}
this.currentTerm = terms.trim();
diff --git a/src/portal/lib/src/project-policy-config/project-policy-config.component.html b/src/portal/lib/src/project-policy-config/project-policy-config.component.html
index 31912edc3..8d5e69f81 100644
--- a/src/portal/lib/src/project-policy-config/project-policy-config.component.html
+++ b/src/portal/lib/src/project-policy-config/project-policy-config.component.html
@@ -89,12 +89,12 @@
-
-
@@ -102,10 +102,10 @@
diff --git a/src/portal/lib/src/project-policy-config/project-policy-config.component.scss b/src/portal/lib/src/project-policy-config/project-policy-config.component.scss
index 4b7cab641..05d4bc5d1 100644
--- a/src/portal/lib/src/project-policy-config/project-policy-config.component.scss
+++ b/src/portal/lib/src/project-policy-config/project-policy-config.component.scss
@@ -17,8 +17,6 @@
width: 222px;
color: #0079bb;
overflow-y: auto;
- white-space: nowrap;
-
li {
height: 24px;
line-height: 24px;
diff --git a/src/portal/lib/src/project-policy-config/project-policy-config.component.ts b/src/portal/lib/src/project-policy-config/project-policy-config.component.ts
index 58a68227e..a6ab59495 100644
--- a/src/portal/lib/src/project-policy-config/project-policy-config.component.ts
+++ b/src/portal/lib/src/project-policy-config/project-policy-config.component.ts
@@ -170,6 +170,9 @@ export class ProjectPolicyConfigComponent implements OnInit {
if (!response.cve_whitelist['expires_at']) {
response.cve_whitelist['expires_at'] = null;
}
+ if (!response.metadata.reuse_sys_cve_whitelist) {
+ response.metadata.reuse_sys_cve_whitelist = "true";
+ }
if (response && response.cve_whitelist) {
this.projectWhitelist = clone(response.cve_whitelist);
this.projectWhitelistOrigin = clone(response.cve_whitelist);
diff --git a/src/portal/lib/src/replication/replication-tasks/replication-tasks.component.html b/src/portal/lib/src/replication/replication-tasks/replication-tasks.component.html
index d441c799b..633f020e6 100644
--- a/src/portal/lib/src/replication/replication-tasks/replication-tasks.component.html
+++ b/src/portal/lib/src/replication/replication-tasks/replication-tasks.component.html
@@ -92,7 +92,7 @@
-
+
{{'REPLICATION.TASK_ID'| translate}}
{{'REPLICATION.RESOURCE_TYPE' | translate}}
{{'REPLICATION.SOURCE' | translate}}
@@ -102,7 +102,7 @@
{{'REPLICATION.CREATION_TIME' | translate}}
{{'REPLICATION.END_TIME' | translate}}
{{'REPLICATION.LOGS' | translate}}
-
+
{{t.id}}
{{t.resource_type}}
{{t.src_resource}}
@@ -118,8 +118,8 @@
- {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'REPLICATION.OF' | translate}} {{pagination.totalItems }} {{'REPLICATION.ITEMS' | translate}}
-
+ {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'REPLICATION.OF' | translate}} {{totalCount }} {{'REPLICATION.ITEMS' | translate}}
+
diff --git a/src/portal/lib/src/replication/replication-tasks/replication-tasks.component.ts b/src/portal/lib/src/replication/replication-tasks/replication-tasks.component.ts
index a9984d47f..d80320319 100644
--- a/src/portal/lib/src/replication/replication-tasks/replication-tasks.component.ts
+++ b/src/portal/lib/src/replication/replication-tasks/replication-tasks.component.ts
@@ -6,8 +6,9 @@ import { finalize } from "rxjs/operators";
import { Subscription, timer } from "rxjs";
import { ErrorHandler } from "../../error-handler/error-handler";
import { ReplicationJob, ReplicationTasks, Comparator, ReplicationJobItem, State } from "../../service/interface";
-import { CustomComparator, DEFAULT_PAGE_SIZE, calculatePage, doFiltering, doSorting } from "../../utils";
+import { CustomComparator, DEFAULT_PAGE_SIZE } from "../../utils";
import { RequestQueryParams } from "../../service/RequestQueryParams";
+import { REFRESH_TIME_DIFFERENCE } from '../../shared/shared.const';
const executionStatus = 'InProgress';
@Component({
selector: 'replication-tasks',
@@ -18,8 +19,8 @@ export class ReplicationTasksComponent implements OnInit, OnDestroy {
isOpenFilterTag: boolean;
inProgress: boolean = false;
currentPage: number = 1;
- selectedRow: [];
pageSize: number = DEFAULT_PAGE_SIZE;
+ totalCount: number;
loading = true;
searchTask: string;
defaultFilter = "resource_type";
@@ -47,7 +48,6 @@ export class ReplicationTasksComponent implements OnInit, OnDestroy {
ngOnInit(): void {
this.searchTask = '';
this.getExecutionDetail();
- this.clrLoadTasks();
}
getExecutionDetail(): void {
@@ -67,14 +67,17 @@ export class ReplicationTasksComponent implements OnInit, OnDestroy {
clrLoadPage(): void {
if (!this.timerDelay) {
- this.timerDelay = timer(10000, 10000).subscribe(() => {
+ this.timerDelay = timer(REFRESH_TIME_DIFFERENCE, REFRESH_TIME_DIFFERENCE).subscribe(() => {
let count: number = 0;
- if (this.executions['status'] === executionStatus) {
- count++;
- }
+ if (this.executions['status'] === executionStatus) {
+ count++;
+ }
if (count > 0) {
this.getExecutionDetail();
- this.clrLoadTasks();
+ let state: State = {
+ page: {}
+ };
+ this.clrLoadTasks(state);
} else {
this.timerDelay.unsubscribe();
this.timerDelay = null;
@@ -136,16 +139,30 @@ export class ReplicationTasksComponent implements OnInit, OnDestroy {
}
}
- clrLoadTasks(): void {
- this.loading = true;
+ clrLoadTasks(state: State): void {
+ if (!state || !state.page || !this.executionId) {
+ return;
+ }
+
let params: RequestQueryParams = new RequestQueryParams();
+ params = params.set('page_size', this.pageSize + '').set('page', this.currentPage + '');
if (this.searchTask && this.searchTask !== "") {
params = params.set(this.defaultFilter, this.searchTask);
}
+
+ this.loading = true;
this.replicationService.getReplicationTasks(this.executionId, params)
- .pipe(finalize(() => (this.loading = false)))
+ .pipe(finalize(() => {
+ this.loading = false;
+ }))
.subscribe(res => {
- this.tasks = res; // Keep the data
+ if (res.headers) {
+ let xHeader: string = res.headers.get("X-Total-Count");
+ if (xHeader) {
+ this.totalCount = parseInt(xHeader, 0);
+ }
+ }
+ this.tasks = res.body; // Keep the data
},
error => {
this.errorHandler.error(error);
@@ -162,23 +179,20 @@ export class ReplicationTasksComponent implements OnInit, OnDestroy {
// refresh icon
refreshTasks(): void {
- this.loading = true;
this.currentPage = 1;
- this.replicationService.getReplicationTasks(this.executionId)
- .subscribe(res => {
- this.tasks = res;
- this.loading = false;
- },
- error => {
- this.loading = false;
- this.errorHandler.error(error);
- });
+ let state: State = {
+ page: {}
+ };
+ this.clrLoadTasks(state);
}
public doSearch(value: string): void {
+ this.currentPage = 1;
this.searchTask = value.trim();
- this.loading = true;
- this.clrLoadTasks();
+ let state: State = {
+ page: {}
+ };
+ this.clrLoadTasks(state);
}
openFilter(isOpen: boolean): void {
diff --git a/src/portal/lib/src/replication/replication.component.ts b/src/portal/lib/src/replication/replication.component.ts
index e211af9ea..1bdbfe200 100644
--- a/src/portal/lib/src/replication/replication.component.ts
+++ b/src/portal/lib/src/replication/replication.component.ts
@@ -48,7 +48,8 @@ import {
import {
ConfirmationTargets,
ConfirmationButtons,
- ConfirmationState
+ ConfirmationState,
+ REFRESH_TIME_DIFFERENCE
} from "../shared/shared.const";
import { ConfirmationMessage } from "../confirmation-dialog/confirmation-message";
import { ConfirmationDialogComponent } from "../confirmation-dialog/confirmation-dialog.component";
@@ -214,7 +215,7 @@ export class ReplicationComponent implements OnInit, OnDestroy {
this.totalCount = response.metadata.xTotalCount;
this.jobs = response.data;
if (!this.timerDelay) {
- this.timerDelay = timer(10000, 10000).subscribe(() => {
+ this.timerDelay = timer(REFRESH_TIME_DIFFERENCE, REFRESH_TIME_DIFFERENCE).subscribe(() => {
let count: number = 0;
this.jobs.forEach(job => {
if (
diff --git a/src/portal/lib/src/service/interface.ts b/src/portal/lib/src/service/interface.ts
index 5de814f2b..17e739d91 100644
--- a/src/portal/lib/src/service/interface.ts
+++ b/src/portal/lib/src/service/interface.ts
@@ -66,6 +66,8 @@ export interface Tag extends Base {
signature?: string;
scan_overview?: VulnerabilitySummary;
labels: Label[];
+ push_time?: string;
+ pull_time?: string;
}
/**
diff --git a/src/portal/lib/src/service/replication.service.ts b/src/portal/lib/src/service/replication.service.ts
index 135f04b8c..3da31077f 100644
--- a/src/portal/lib/src/service/replication.service.ts
+++ b/src/portal/lib/src/service/replication.service.ts
@@ -296,8 +296,7 @@ export class ReplicationDefaultService extends ReplicationService {
}
let url: string = `${this._replicateUrl}/executions/${executionId}/tasks`;
return this.http
- .get(url,
- queryParams ? buildHttpRequestOptions(queryParams) : HTTP_GET_OPTIONS)
+ .get(url, buildHttpRequestOptionsWithObserveResponse(queryParams))
.pipe(map(response => response as ReplicationTasks)
, catchError(error => observableThrowError(error)));
}
diff --git a/src/portal/lib/src/service/tag.service.ts b/src/portal/lib/src/service/tag.service.ts
index 9020200f3..336fa2369 100644
--- a/src/portal/lib/src/service/tag.service.ts
+++ b/src/portal/lib/src/service/tag.service.ts
@@ -140,7 +140,7 @@ export class TagDefaultService extends TagService {
queryParams = queryParams = new RequestQueryParams();
}
- queryParams = queryParams.set("detail", "1");
+ queryParams = queryParams.set("detail", "true");
let url: string = `${this._baseUrl}/${repositoryName}/tags`;
return this.http
diff --git a/src/portal/lib/src/shared/shared.const.ts b/src/portal/lib/src/shared/shared.const.ts
index 8a310b086..ff1935071 100644
--- a/src/portal/lib/src/shared/shared.const.ts
+++ b/src/portal/lib/src/shared/shared.const.ts
@@ -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"
}
@@ -122,6 +123,8 @@ export const CONFIG_AUTH_MODE = {
OIDC_AUTH: "oidc_auth",
UAA_AUTH: "uaa_auth"
};
+export const QUOTA_DANGER_COEFFICIENT = 0.9;
+export const QUOTA_WARNING_COEFFICIENT = 0.7;
export const PROJECT_ROOTS = [
{
NAME: "admin",
@@ -149,3 +152,4 @@ export enum GroupType {
LDAP_TYPE = 1,
HTTP_TYPE = 2
}
+export const REFRESH_TIME_DIFFERENCE = 10000;
diff --git a/src/portal/lib/src/tag/tag.component.html b/src/portal/lib/src/tag/tag.component.html
index 362030eb2..9df2ddad1 100644
--- a/src/portal/lib/src/tag/tag.component.html
+++ b/src/portal/lib/src/tag/tag.component.html
@@ -85,8 +85,8 @@
{{'REPOSITORY.CREATED' | translate}}
{{'REPOSITORY.DOCKER_VERSION' | translate}}
{{'REPOSITORY.LABELS' | translate}}
-
{{'REPOSITORY.PULL_TIME' | translate}}
-
{{'REPOSITORY.PUSH_TIME' | translate}}
+
{{'REPOSITORY.PUSH_TIME' | translate}}
+
{{'REPOSITORY.PULL_TIME' | translate}}
{{'TAG.PLACEHOLDER' | translate }}
@@ -125,8 +125,8 @@