Merge branch 'main' into test_confoemance

goharbor · Aug 25, 2023 · f329806 · f329806
2 parents a4fce15 + dd90313
commit f329806
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 10 deletions.
diff --git a/...ervices/vulnerability-database/vulnerability-summary/vulnerability-summary.component.html b/...ervices/vulnerability-database/vulnerability-summary/vulnerability-summary.component.html
@@ -5,6 +5,12 @@ <h2>
     {{ 'SECURITY_HUB.SCANNED' | translate }},
     {{ securitySummary?.total_artifact - securitySummary?.scanned_cnt }}
     {{ 'SECURITY_HUB.NOT_SCANNED' | translate }}
+    <clr-tooltip class="page-title-tooltip">
+        <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
+        <clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
+            <span>{{ 'SECURITY_HUB.PAGE_TITLE_TOOLTIP' | translate }}</span>
+        </clr-tooltip-content>
+    </clr-tooltip>
 </h2>
 <div class="container">
     <div class="card">

diff --git a/...ervices/vulnerability-database/vulnerability-summary/vulnerability-summary.component.scss b/...ervices/vulnerability-database/vulnerability-summary/vulnerability-summary.component.scss
@@ -98,3 +98,13 @@ $row-height: 48px;
 .clr-col {
   min-width: 0;
 }
+
+.page-title-tooltip {
+  margin-left: 5px;
+  margin-top: -2px;
+}
+
+.h2 {
+  display: flex;
+  align-items: center;
+}
diff --git a/src/portal/src/i18n/lang/de-de-lang.json b/src/portal/src/i18n/lang/de-de-lang.json
@@ -1892,6 +1892,7 @@
         "REPO_NAME": "Repository Name",
         "TOOLTIP": "All filters except CVSS3 only support exact matches",
         "NO_VUL": "We could not find any vulnerability",
-        "INVALID_VALUE": "Invalid range"
+        "INVALID_VALUE": "The CVSS3 score should range between 0 and 10",
+        "PAGE_TITLE_TOOLTIP": "The comprehensive artifact count comprises the cumulative total of individual artifacts, including artifact accessories, as well as child artifacts associated with the image index and CNAB artifacts"
     }
 }
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
@@ -1893,6 +1893,7 @@
         "REPO_NAME": "Repository Name",
         "TOOLTIP": "All filters except CVSS3 only support exact matches",
         "NO_VUL": "We could not find any vulnerability",
-        "INVALID_VALUE": "Invalid range"
+        "INVALID_VALUE": "The CVSS3 score should range between 0 and 10",
+        "PAGE_TITLE_TOOLTIP": "The comprehensive artifact count comprises the cumulative total of individual artifacts, including artifact accessories, as well as child artifacts associated with the image index and CNAB artifacts"
     }
 }
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
@@ -1232,7 +1232,7 @@
         "EXPLAIN_TIME_WINDOW": "Artifacts uploaded in the past 2 hours(the default window) are excluded from garbage collection",
         "DRY_RUN_SUCCESS": "Triggered dry run successfully",
         "DELETE_DETAIL": "{{blob}} blob(s) and {{manifest}} manifest(s) deleted, {{size}} space freed up",
-        "DELETE_DETAIL_DRY_RUN": "{{blob}} blob(s) and {{manifest}} manifest(s) could be deleted, {{size}} space could be freed up",,
+        "DELETE_DETAIL_DRY_RUN": "{{blob}} blob(s) and {{manifest}} manifest(s) could be deleted, {{size}} space could be freed up",
         "WORKERS_TOOLTIP": "Set the number of workers that can execute GC tasks in parallel, the default value is 1."
     },
     "RETAG": {
@@ -1889,6 +1889,7 @@
         "REPO_NAME": "Repository Name",
         "TOOLTIP": "All filters except CVSS3 only support exact matches",
         "NO_VUL": "We could not find any vulnerability",
-        "INVALID_VALUE": "Invalid range"
+        "INVALID_VALUE": "The CVSS3 score should range between 0 and 10",
+        "PAGE_TITLE_TOOLTIP": "The comprehensive artifact count comprises the cumulative total of individual artifacts, including artifact accessories, as well as child artifacts associated with the image index and CNAB artifacts"
     }
 }
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -1859,6 +1859,7 @@
         "REPO_NAME": "Repository Name",
         "TOOLTIP": "All filters except CVSS3 only support exact matches",
         "NO_VUL": "We could not find any vulnerability",
-        "INVALID_VALUE": "Invalid range"
+        "INVALID_VALUE": "The CVSS3 score should range between 0 and 10",
+        "PAGE_TITLE_TOOLTIP": "The comprehensive artifact count comprises the cumulative total of individual artifacts, including artifact accessories, as well as child artifacts associated with the image index and CNAB artifacts"
     }
 }
diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -1889,6 +1889,7 @@
         "REPO_NAME": "Repository Name",
         "TOOLTIP": "All filters except CVSS3 only support exact matches",
         "NO_VUL": "We could not find any vulnerability",
-        "INVALID_VALUE": "Invalid range"
+        "INVALID_VALUE": "The CVSS3 score should range between 0 and 10",
+        "PAGE_TITLE_TOOLTIP": "The comprehensive artifact count comprises the cumulative total of individual artifacts, including artifact accessories, as well as child artifacts associated with the image index and CNAB artifacts"
     }
 }
diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json
@@ -1892,6 +1892,7 @@
         "REPO_NAME": "Repository Name",
         "TOOLTIP": "All filters except CVSS3 only support exact matches",
         "NO_VUL": "We could not find any vulnerability",
-        "INVALID_VALUE": "Invalid range"
+        "INVALID_VALUE": "The CVSS3 score should range between 0 and 10",
+        "PAGE_TITLE_TOOLTIP": "The comprehensive artifact count comprises the cumulative total of individual artifacts, including artifact accessories, as well as child artifacts associated with the image index and CNAB artifacts"
     }
 }
diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -135,7 +135,7 @@
         "ADMIN_CLI_SECRET_BUTTON": "生成新的CLI密码",
         "ADMIN_CLI_SECRET_RESET_BUTTON": "输入您自己的CLI密码",
         "NEW_SECRET": "密码",
-        "CONFIRM_SECRET": "重复出入密码",
+        "CONFIRM_SECRET": "重复输入密码",
         "GENERATE_SUCCESS": "成功设置新的CLI密码",
         "GENERATE_ERROR": "设置新的CLI密码失败",
         "CONFIRM_TITLE_CLI_GENERATE": "您确定需要重新生成cli secret吗?",
@@ -1889,6 +1889,7 @@
         "REPO_NAME": "仓库名称",
         "TOOLTIP": "CVSS3 除外的所有过滤项只支持精确匹配",
         "NO_VUL": "未找到任何漏洞",
-        "INVALID_VALUE": "无效范围"
+        "INVALID_VALUE": "CVSS3 分数的范围为0到10",
+        "PAGE_TITLE_TOOLTIP": "Artifact 总数是指所有单个 Artifact 的总数， 它包含了 Artifact 的附件数量、镜像索引中的子 Artifact 数量和 CNAB 中的子 Artifact 数量"
     }
 }
diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json
@@ -1887,6 +1887,7 @@
     "REPO_NAME": "儲存庫名稱",
     "TOOLTIP": "除了 CVSS3 之外，所有的篩選條件都只支援完全符合",
     "NO_VUL": "我們找不到任何弱點",
-    "INVALID_VALUE": "無效的範圍"
+    "INVALID_VALUE": "The CVSS3 score should range between 0 and 10",
+    "PAGE_TITLE_TOOLTIP": "The comprehensive artifact count comprises the cumulative total of individual artifacts, including artifact accessories, as well as child artifacts associated with the image index and CNAB artifacts"
   }
 }