From 86dac8bbb9421db45b285a288165c8cdd84a851b Mon Sep 17 00:00:00 2001 From: "Deng, Qian" Date: Fri, 26 Jan 2018 18:10:39 +0800 Subject: [PATCH 1/2] Fix relication description too long to display --- src/ui_ng/lib/package.json | 2 +- .../list-replication-rule.component.html.ts | 10 +++++++++- .../list-replication-rule.component.ts | 10 ++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/ui_ng/lib/package.json b/src/ui_ng/lib/package.json index bba58816b..f12055fe0 100644 --- a/src/ui_ng/lib/package.json +++ b/src/ui_ng/lib/package.json @@ -1,6 +1,6 @@ { "name": "harbor-ui", - "version": "0.6.30", + "version": "0.6.34-dev.3", "description": "Harbor shared UI components based on Clarity and Angular4", "scripts": { "start": "ng serve --host 0.0.0.0 --port 4500 --proxy-config proxy.config.json", diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts index c9e3d4312..f5e4f9af0 100644 --- a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts @@ -18,7 +18,15 @@ export const LIST_REPLICATION_RULE_TEMPLATE: string = ` {{p.projects?.length>0 ? p.projects[0].name : ''}} - {{p.description ? p.description : '-'}} + + {{p.description ? trancatedDescription(p.description) : '-'}} + + + + {{p.description}} + + + {{p.targets?.length>0 ? p.targets[0].name : ''}} {{p.trigger ? p.trigger.kind : ''}} diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts index 135a843f9..c4ec239e3 100644 --- a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.ts @@ -42,12 +42,14 @@ import { toPromise, CustomComparator } from '../utils'; import { State, Comparator } from 'clarity-angular'; import { LIST_REPLICATION_RULE_TEMPLATE } from './list-replication-rule.component.html'; +import { LIST_REPLICATION_RULE_CSS } from './list-replication-rule.component.css'; import {BatchInfo, BathInfoChanges} from "../confirmation-dialog/confirmation-batch-message"; import {Observable} from "rxjs/Observable"; @Component({ selector: 'hbr-list-replication-rule', template: LIST_REPLICATION_RULE_TEMPLATE, + styles: [LIST_REPLICATION_RULE_CSS], changeDetection: ChangeDetectionStrategy.OnPush }) export class ListReplicationRuleComponent implements OnInit, OnChanges { @@ -101,6 +103,14 @@ export class ListReplicationRuleComponent implements OnInit, OnChanges { return !this.readonly && !this.projectId ? true : false; } + trancatedDescription(desc: string): string { + if (desc.length > 35 ) { + return desc.substr(0, 35); + } else { + return desc; + } + } + ngOnInit(): void { //Global scope if (!this.projectScope) { From 8f1fa387c2df8d99a9b0796aba88d75867763152 Mon Sep 17 00:00:00 2001 From: "Deng, Qian" Date: Fri, 26 Jan 2018 18:11:15 +0800 Subject: [PATCH 2/2] Fix admin rename tooltip --- src/ui_ng/lib/package.json | 2 +- src/ui_ng/lib/pkg/package.json | 2 +- .../list-replication-rule.component.css.ts | 2 ++ src/ui_ng/package.json | 2 +- .../account-settings/account-settings-modal.component.html | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.css.ts diff --git a/src/ui_ng/lib/package.json b/src/ui_ng/lib/package.json index f12055fe0..90749f512 100644 --- a/src/ui_ng/lib/package.json +++ b/src/ui_ng/lib/package.json @@ -1,6 +1,6 @@ { "name": "harbor-ui", - "version": "0.6.34-dev.3", + "version": "0.6.37", "description": "Harbor shared UI components based on Clarity and Angular4", "scripts": { "start": "ng serve --host 0.0.0.0 --port 4500 --proxy-config proxy.config.json", diff --git a/src/ui_ng/lib/pkg/package.json b/src/ui_ng/lib/pkg/package.json index f85d0b751..c34b70587 100644 --- a/src/ui_ng/lib/pkg/package.json +++ b/src/ui_ng/lib/pkg/package.json @@ -1,6 +1,6 @@ { "name": "harbor-ui", - "version": "0.6.30", + "version": "0.6.37", "description": "Harbor shared UI components based on Clarity and Angular4", "author": "VMware", "module": "index.js", diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.css.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.css.ts new file mode 100644 index 000000000..67157fd6c --- /dev/null +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.css.ts @@ -0,0 +1,2 @@ +export const LIST_REPLICATION_RULE_CSS = ` +` \ No newline at end of file diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index 03bb05a35..e356c01e6 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -31,7 +31,7 @@ "clarity-icons": "^0.10.17", "clarity-ui": "^0.10.17", "core-js": "^2.4.1", - "harbor-ui": "0.6.34", + "harbor-ui": "0.6.37", "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", "ngx-cookie": "^1.0.0", diff --git a/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html b/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html index 36d754823..2790c71bf 100644 --- a/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html +++ b/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html @@ -12,7 +12,7 @@ - {{'PROFILE.ADMIN_RENAME_TIP'}} + {{'PROFILE.ADMIN_RENAME_TIP' | translate}}