From 26381c93be5aa797791cdd7c5423b3ddd8eba756 Mon Sep 17 00:00:00 2001 From: Yogi_Wang Date: Thu, 24 Oct 2019 12:38:09 +0800 Subject: [PATCH] Improve Immutable tag UI Signed-off-by: Yogi_Wang --- .../add-rule/add-rule.component.html | 14 +++++----- .../add-rule/add-rule.component.ts | 4 +-- .../immutable-tag.component.html | 24 ++++++++--------- .../immutable-tag.component.scss | 15 +++++++++++ .../immutable-tag/immutable-tag.component.ts | 5 ++-- .../immutable-tag/immutable-tag.service.ts | 24 ++--------------- src/portal/src/i18n/lang/en-us-lang.json | 26 +++++++++++++++++++ src/portal/src/i18n/lang/es-es-lang.json | 26 +++++++++++++++++++ src/portal/src/i18n/lang/fr-fr-lang.json | 26 +++++++++++++++++++ src/portal/src/i18n/lang/pt-br-lang.json | 26 +++++++++++++++++++ src/portal/src/i18n/lang/tr-tr-lang.json | 26 +++++++++++++++++++ src/portal/src/i18n/lang/zh-cn-lang.json | 26 +++++++++++++++++++ 12 files changed, 197 insertions(+), 45 deletions(-) diff --git a/src/portal/src/app/project/immutable-tag/add-rule/add-rule.component.html b/src/portal/src/app/project/immutable-tag/add-rule/add-rule.component.html index 32caf0b85..6eaacfeca 100644 --- a/src/portal/src/app/project/immutable-tag/add-rule/add-rule.component.html +++ b/src/portal/src/app/project/immutable-tag/add-rule/add-rule.component.html @@ -1,13 +1,13 @@ -

{{'TAG_RETENTION.ADD_TITLE' | translate}}

-

{{'TAG_RETENTION.EDIT_TITLE' | translate}}

+

{{'IMMUTABLE_TAG.ADD_TITLE' | translate}}

+

{{'IMMUTABLE_TAG.EDIT_TITLE' | translate}}

-

{{'TAG_RETENTION.ADD_SUBTITLE' | translate}}

+

{{'IMMUTABLE_TAG.ADD_SUBTITLE' | translate}}

- {{'TAG_RETENTION.IN_REPOSITORIES' | translate}} + {{'IMMUTABLE_TAG.IN_REPOSITORIES' | translate}}
@@ -26,14 +26,14 @@
- {{'TAG_RETENTION.REP_SEPARATOR' | translate}} + {{'IMMUTABLE_TAG.REP_SEPARATOR' | translate}}
- +
@@ -52,7 +52,7 @@
- {{'TAG_RETENTION.TAG_SEPARATOR' | translate}} + {{'IMMUTABLE_TAG.TAG_SEPARATOR' | translate}}
diff --git a/src/portal/src/app/project/immutable-tag/add-rule/add-rule.component.ts b/src/portal/src/app/project/immutable-tag/add-rule/add-rule.component.ts index 37250adfe..d6068ab44 100644 --- a/src/portal/src/app/project/immutable-tag/add-rule/add-rule.component.ts +++ b/src/portal/src/app/project/immutable-tag/add-rule/add-rule.component.ts @@ -54,7 +54,7 @@ export class AddRuleComponent implements OnInit, OnDestroy { set repositories(repositories) { if (this.rule && this.rule.scope_selectors && this.rule.scope_selectors.repository - && this.rule.scope_selectors.repository[0] && this.rule.scope_selectors.repository[0].pattern) { + && this.rule.scope_selectors.repository[0]) { if (repositories.indexOf(",") !== -1) { this.rule.scope_selectors.repository[0].pattern = "{" + repositories + "}"; } else { @@ -85,7 +85,7 @@ export class AddRuleComponent implements OnInit, OnDestroy { } set tagsInput(tagsInput) { - if (this.rule && this.rule.tag_selectors && this.rule.tag_selectors[0] && this.rule.tag_selectors[0].pattern) { + if (this.rule && this.rule.tag_selectors && this.rule.tag_selectors[0]) { if (tagsInput.indexOf(",") !== -1) { this.rule.tag_selectors[0].pattern = "{" + tagsInput + "}"; } else { diff --git a/src/portal/src/app/project/immutable-tag/immutable-tag.component.html b/src/portal/src/app/project/immutable-tag/immutable-tag.component.html index 22b2c4b92..f0beb27ef 100644 --- a/src/portal/src/app/project/immutable-tag/immutable-tag.component.html +++ b/src/portal/src/app/project/immutable-tag/immutable-tag.component.html @@ -1,6 +1,6 @@
- {{rules?.length ? rules?.length : 0}}/15 + {{rules?.length ? rules?.length : 0}}/15
@@ -12,14 +12,14 @@
- - - - + + + +
@@ -29,16 +29,16 @@ - {{'TAG_RETENTION.IN_REPOSITORIES' | translate}} + {{'IMMUTABLE_TAG.IN_REPOSITORIES' | translate}} {{getI18nKey(rule?.scope_selectors?.repository[0]?.decoration)|translate}} {{formatPattern(rule?.scope_selectors?.repository[0]?.pattern)}} , - {{'TAG_RETENTION.LOWER_TAGS' | translate}} + {{'IMMUTABLE_TAG.LOWER_TAGS' | translate}} {{getI18nKey(rule?.tag_selectors[0]?.decoration)|translate}} {{formatPattern(rule?.tag_selectors[0]?.pattern)}} - {{'TAG_RETENTION.AND' | translate}} - {{'TAG_RETENTION.LOWER_LABELS' | translate}} + {{'IMMUTABLE_TAG.AND' | translate}} + {{'IMMUTABLE_TAG.LOWER_LABELS' | translate}} {{getI18nKey(rule?.tag_selectors[1]?.decoration)|translate}} {{rule?.tag_selectors[1]?.pattern}} @@ -50,10 +50,10 @@
- +
- {{'TAG_RETENTION.ADD_RULE_HELP_1' | translate}} + {{'IMMUTABLE_TAG.ADD_RULE_HELP_1' | translate}}
diff --git a/src/portal/src/app/project/immutable-tag/immutable-tag.component.scss b/src/portal/src/app/project/immutable-tag/immutable-tag.component.scss index e69de29bb..c326863e4 100644 --- a/src/portal/src/app/project/immutable-tag/immutable-tag.component.scss +++ b/src/portal/src/app/project/immutable-tag/immutable-tag.component.scss @@ -0,0 +1,15 @@ +.ml-5 { + margin-left: 5px; +} +.dropdown-toggle { + outline: none; +} +.backdrop-transparent { + position: fixed; + top: 0; + bottom: 0; + right: 0; + left: 0; + opacity: 0; + z-index: 999; +} diff --git a/src/portal/src/app/project/immutable-tag/immutable-tag.component.ts b/src/portal/src/app/project/immutable-tag/immutable-tag.component.ts index b5ef4e0bf..bf6730c4a 100644 --- a/src/portal/src/app/project/immutable-tag/immutable-tag.component.ts +++ b/src/portal/src/app/project/immutable-tag/immutable-tag.component.ts @@ -63,10 +63,11 @@ export class ImmutableTagComponent implements OnInit { this.ruleIndex = -1; } toggleDisable(rule, isActionDisable) { - rule.disabled = isActionDisable; + let cloneRule = clone(rule); + cloneRule.disabled = isActionDisable; this.ruleIndex = -1; this.loadingRule = true; - this.immutableTagService.updateRule(this.projectId, rule).subscribe( + this.immutableTagService.updateRule(this.projectId, cloneRule).subscribe( response => { this.getRules(); }, error => { diff --git a/src/portal/src/app/project/immutable-tag/immutable-tag.service.ts b/src/portal/src/app/project/immutable-tag/immutable-tag.service.ts index de28390c4..cd214301e 100644 --- a/src/portal/src/app/project/immutable-tag/immutable-tag.service.ts +++ b/src/portal/src/app/project/immutable-tag/immutable-tag.service.ts @@ -8,34 +8,14 @@ import { HTTP_JSON_OPTIONS } from "@harbor/ui"; @Injectable() export class ImmutableTagService { private I18nMap: object = { - "retain": "ACTION_RETAIN", - "lastXDays": "RULE_NAME_1", - "latestActiveK": "RULE_NAME_2", - "latestPushedK": "RULE_NAME_3", - "latestPulledN": "RULE_NAME_4", - "always": "RULE_NAME_5", - "nDaysSinceLastPull": "RULE_NAME_6", - "nDaysSinceLastPush": "RULE_NAME_7", - "the images from the last # days": "RULE_TEMPLATE_1", - "the most recent active # images": "RULE_TEMPLATE_2", - "the most recently pushed # images": "RULE_TEMPLATE_3", - "the most recently pulled # images": "RULE_TEMPLATE_4", - "pulled within the last # days": "RULE_TEMPLATE_6", - "pushed within the last # days": "RULE_TEMPLATE_7", "repoMatches": "MAT", "repoExcludes": "EXC", "matches": "MAT", "excludes": "EXC", "withLabels": "WITH", "withoutLabels": "WITHOUT", - "COUNT": "UNIT_COUNT", - "DAYS": "UNIT_DAY", "none": "NONE", - "nothing": "NONE", - "Parameters nDaysSinceLastPull is too large": "DAYS_LARGE", - "Parameters nDaysSinceLastPush is too large": "DAYS_LARGE", - "Parameters latestPushedK is too large": "COUNT_LARGE", - "Parameters latestPulledN is too large": "COUNT_LARGE" + "nothing": "NONE" }; constructor( @@ -45,7 +25,7 @@ export class ImmutableTagService { getI18nKey(str: string): string { if (this.I18nMap[str.trim()]) { - return "TAG_RETENTION." + this.I18nMap[str.trim()]; + return "IMMUTABLE_TAG." + this.I18nMap[str.trim()]; } return str; } diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index 0b369c003..9f8267377 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -1233,6 +1233,32 @@ "EXECUTION_TYPE": "Execution Type", "ACTION": "ACTION" }, + "IMMUTABLE_TAG": { + "IMMUTABLE_RULES": "Immutable rules", + "ADD_RULE": "ADD RULE", + "ADD_RULE_HELP_1": "Click the ADD RULE button to add a rule.", + "EDIT": "Edit", + "DISABLE": "Disable", + "ENABLE": "Enable", + "DELETE": "Delete", + "ADD_TITLE": "Add Immutable Rule", + "ADD_SUBTITLE": "Specify a immutable rule for this project. All immutable rules are independently calculated and each rule can be applied to a selected list of repositories.", + "IN_REPOSITORIES": "For the repositories", + "REP_SEPARATOR": "Enter multiple comma separated repos,repo*,or **", + "TAGS": "Tags", + "TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **", + "EDIT_TITLE": "Edit Immutable Rule", + "EXC": " excluding ", + "MAT": " matching ", + "AND": " and", + "WITH": " with ", + "WITHOUT": " without ", + "LOWER_LABELS": " labels", + "LOWER_TAGS": " tags", + "NONE": " none", + "EXISTING_RULE": "Existing rule", + "ACTION": "ACTION" + }, "SCANNER": { "DELETION_SUMMARY": "Do you want to delete scanner {{param}}?", "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote registry uses a self-signed or untrusted certificate.", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index 500d09b0e..0e6765071 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -1230,6 +1230,32 @@ "EXECUTION_TYPE": "Execution Type", "ACTION": "ACTION" }, + "IMMUTABLE_TAG": { + "IMMUTABLE_RULES": "Immutable rules", + "ADD_RULE": "ADD RULE", + "ADD_RULE_HELP_1": "Click the ADD RULE button to add a rule.", + "EDIT": "Edit", + "DISABLE": "Disable", + "ENABLE": "Enable", + "DELETE": "Delete", + "ADD_TITLE": "Add Immutable Rule", + "ADD_SUBTITLE": "Specify a immutable rule for this project. All immutable rules are independently calculated and each rule can be applied to a selected list of repositories.", + "IN_REPOSITORIES": "For the repositories", + "REP_SEPARATOR": "Enter multiple comma separated repos,repo*,or **", + "TAGS": "Tags", + "TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **", + "EDIT_TITLE": "Edit Immutable Rule", + "EXC": " excluding ", + "MAT": " matching ", + "AND": " and", + "WITH": " with ", + "WITHOUT": " without ", + "LOWER_LABELS": " labels", + "LOWER_TAGS": " tags", + "NONE": " none", + "EXISTING_RULE": "Existing rule", + "ACTION": "ACTION" + }, "SCANNER": { "DELETION_SUMMARY": "Do you want to delete scanner {{param}}?", "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote registry uses a self-signed or untrusted certificate.", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 863ce0c0d..af7fbe979 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -1202,6 +1202,32 @@ "EXECUTION_TYPE": "Execution Type", "ACTION": "ACTION" }, + "IMMUTABLE_TAG": { + "IMMUTABLE_RULES": "Immutable rules", + "ADD_RULE": "ADD RULE", + "ADD_RULE_HELP_1": "Click the ADD RULE button to add a rule.", + "EDIT": "Edit", + "DISABLE": "Disable", + "ENABLE": "Enable", + "DELETE": "Delete", + "ADD_TITLE": "Add Immutable Rule", + "ADD_SUBTITLE": "Specify a immutable rule for this project. All immutable rules are independently calculated and each rule can be applied to a selected list of repositories.", + "IN_REPOSITORIES": "For the repositories", + "REP_SEPARATOR": "Enter multiple comma separated repos,repo*,or **", + "TAGS": "Tags", + "TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **", + "EDIT_TITLE": "Edit Immutable Rule", + "EXC": " excluding ", + "MAT": " matching ", + "AND": " and", + "WITH": " with ", + "WITHOUT": " without ", + "LOWER_LABELS": " labels", + "LOWER_TAGS": " tags", + "NONE": " none", + "EXISTING_RULE": "Existing rule", + "ACTION": "ACTION" + }, "SCANNER": { "DELETION_SUMMARY": "Do you want to delete scanner {{param}}?", "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote registry uses a self-signed or untrusted certificate.", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 45bc09147..2f91ae318 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -1227,6 +1227,32 @@ "EXECUTION_TYPE": "Execution Type", "ACTION": "ACTION" }, + "IMMUTABLE_TAG": { + "IMMUTABLE_RULES": "Immutable rules", + "ADD_RULE": "ADD RULE", + "ADD_RULE_HELP_1": "Click the ADD RULE button to add a rule.", + "EDIT": "Edit", + "DISABLE": "Disable", + "ENABLE": "Enable", + "DELETE": "Delete", + "ADD_TITLE": "Add Immutable Rule", + "ADD_SUBTITLE": "Specify a immutable rule for this project. All immutable rules are independently calculated and each rule can be applied to a selected list of repositories.", + "IN_REPOSITORIES": "For the repositories", + "REP_SEPARATOR": "Enter multiple comma separated repos,repo*,or **", + "TAGS": "Tags", + "TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **", + "EDIT_TITLE": "Edit Immutable Rule", + "EXC": " excluding ", + "MAT": " matching ", + "AND": " and", + "WITH": " with ", + "WITHOUT": " without ", + "LOWER_LABELS": " labels", + "LOWER_TAGS": " tags", + "NONE": " none", + "EXISTING_RULE": "Existing rule", + "ACTION": "ACTION" + }, "SCANNER": { "DELETION_SUMMARY": "Do you want to delete scanner {{param}}?", "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote registry uses a self-signed or untrusted certificate.", diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index 28ec1051c..09eafba0c 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -1232,6 +1232,32 @@ "EXECUTION_TYPE": "Execution Type", "ACTION": "ACTION" }, + "IMMUTABLE_TAG": { + "IMMUTABLE_RULES": "Immutable rules", + "ADD_RULE": "ADD RULE", + "ADD_RULE_HELP_1": "Click the ADD RULE button to add a rule.", + "EDIT": "Edit", + "DISABLE": "Disable", + "ENABLE": "Enable", + "DELETE": "Delete", + "ADD_TITLE": "Add Immutable Rule", + "ADD_SUBTITLE": "Specify a immutable rule for this project. All immutable rules are independently calculated and each rule can be applied to a selected list of repositories.", + "IN_REPOSITORIES": "For the repositories", + "REP_SEPARATOR": "Enter multiple comma separated repos,repo*,or **", + "TAGS": "Tags", + "TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **", + "EDIT_TITLE": "Edit Immutable Rule", + "EXC": " excluding ", + "MAT": " matching ", + "AND": " and", + "WITH": " with ", + "WITHOUT": " without ", + "LOWER_LABELS": " labels", + "LOWER_TAGS": " tags", + "NONE": " none", + "EXISTING_RULE": "Existing rule", + "ACTION": "ACTION" + }, "SCANNER": { "DELETION_SUMMARY": "Do you want to delete scanner {{param}}?", "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote registry uses a self-signed or untrusted certificate.", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 21abac5bd..58ac96c4e 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -1229,6 +1229,32 @@ "EXECUTION_TYPE": "执行类型", "ACTION": "操作" }, + "IMMUTABLE_TAG": { + "IMMUTABLE_RULES": "不变的规则", + "ADD_RULE": "添加新规则", + "ADD_RULE_HELP_1": "点击添加按钮可添加规则。", + "EDIT": "修改", + "DISABLE": "禁用", + "ENABLE": "启用", + "DELETE": "删除", + "ADD_TITLE": "添加不变的规则", + "ADD_SUBTITLE": "为当前项目指定不改变规则。所有不改变的规则独立计算并且适用于所有符合条件的仓库。", + "IN_REPOSITORIES": "应用到仓库", + "REP_SEPARATOR": "使用逗号分隔repos,repo*和**。", + "TAGS": "Tags", + "TAG_SEPARATOR": "使用逗号分割tags,tag*和**。", + "EDIT_TITLE": "编辑不改变的规则", + "EXC": "排除", + "MAT": "匹配", + "AND": "且", + "WITH": "有", + "WITHOUT": "没有", + "LOWER_LABELS": "标签", + "LOWER_TAGS": " tags", + "NONE": " 无", + "EXISTING_RULE": "规则已存在。", + "ACTION": "操作" + }, "SCANNER": { "DELETION_SUMMARY": "确定删除扫描器{{param}}？", "SKIP_CERT_VERIFY": "当远程注册使用自签或不可信证书时可勾选此项以跳过证书认证。",