-
+
diff --git a/src/portal/src/app/project/p2p-provider/policy/policy.component.ts b/src/portal/src/app/project/p2p-provider/policy/policy.component.ts
index 1245c173b..29ec04a53 100644
--- a/src/portal/src/app/project/p2p-provider/policy/policy.component.ts
+++ b/src/portal/src/app/project/p2p-provider/policy/policy.component.ts
@@ -81,6 +81,7 @@ export class PolicyComponent implements OnInit, OnDestroy {
project: Project;
severity_map: any = PROJECT_SEVERITY_LEVEL_TO_TEXT_MAP;
timeout: any;
+ hasAddModalInit: boolean = false;
constructor(
private route: ActivatedRoute,
private router: Router,
@@ -108,6 +109,9 @@ export class PolicyComponent implements OnInit, OnDestroy {
}
this.clearLoop();
}
+ addModalInit() {
+ this.hasAddModalInit = true;
+ }
getPermissions() {
const permissionsList: Observable[] = [];
permissionsList.push(this.userPermissionService.getPermission(this.projectId,
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index e3f693975..661d7b345 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -1474,7 +1474,7 @@
"UPDATE_FAILED": "Updating instance failed",
"REQUEST_PREHEAT_SUCCESS": "Preheat request successfully",
"REQUEST_PREHEAT_FAILED": "Preheat request failed",
- "DESCRIPTION": "description",
+ "DESCRIPTION": "Description",
"AUTH_MODE": "Auth Mode",
"USERNAME": "Username",
"PASSWORD": "Password",
@@ -1567,6 +1567,9 @@
"TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **",
"CONTENT_WARNING": "Content trust settings here conflicts with the relevant project configuration that will override the settings here",
"PREHEAT_EXPLAIN": "Preheat will migrate the image to the p2p network",
- "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab"
+ "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab",
+ "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote provider uses a self-signed or untrusted certificate.",
+ "NAME_TOOLTIP": "Policy name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
+ "NEED_HELP": "Please ask your system admin to add a provider first"
}
}
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
index fc50b4e3a..7521d58a9 100644
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@@ -1472,7 +1472,7 @@
"UPDATE_FAILED": "Updating instance failed",
"REQUEST_PREHEAT_SUCCESS": "Preheat request successfully",
"REQUEST_PREHEAT_FAILED": "Preheat request failed",
- "DESCRIPTION": "description",
+ "DESCRIPTION": "Description",
"AUTH_MODE": "Auth Mode",
"USERNAME": "Username",
"PASSWORD": "Password",
@@ -1565,6 +1565,9 @@
"TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **",
"CONTENT_WARNING": "Content trust settings here conflicts with the relevant project configuration that will override the settings here",
"PREHEAT_EXPLAIN": "Preheat will migrate the image to the p2p network",
- "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab"
+ "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab",
+ "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote provider uses a self-signed or untrusted certificate.",
+ "NAME_TOOLTIP": "Policy name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
+ "NEED_HELP": "Please ask your system admin to add a provider first"
}
}
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
index 6ddc8aa0c..ecefc6f0c 100644
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -1442,7 +1442,7 @@
"UPDATE_FAILED": "Updating instance failed",
"REQUEST_PREHEAT_SUCCESS": "Preheat request successfully",
"REQUEST_PREHEAT_FAILED": "Preheat request failed",
- "DESCRIPTION": "description",
+ "DESCRIPTION": "Description",
"AUTH_MODE": "Auth Mode",
"USERNAME": "Username",
"PASSWORD": "Password",
@@ -1535,6 +1535,9 @@
"TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **",
"CONTENT_WARNING": "Content trust settings here conflicts with the relevant project configuration that will override the settings here",
"PREHEAT_EXPLAIN": "Preheat will migrate the image to the p2p network",
- "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab"
+ "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab",
+ "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote provider uses a self-signed or untrusted certificate.",
+ "NAME_TOOLTIP": "Policy name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
+ "NEED_HELP": "Please ask your system admin to add a provider first"
}
}
diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
index 7c7bf23e1..cec83fb1f 100644
--- a/src/portal/src/i18n/lang/pt-br-lang.json
+++ b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -1470,7 +1470,7 @@
"UPDATE_FAILED": "Updating instance failed",
"REQUEST_PREHEAT_SUCCESS": "Preheat request successfully",
"REQUEST_PREHEAT_FAILED": "Preheat request failed",
- "DESCRIPTION": "description",
+ "DESCRIPTION": "Description",
"AUTH_MODE": "Auth Mode",
"USERNAME": "Username",
"PASSWORD": "Password",
@@ -1563,7 +1563,10 @@
"TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **",
"CONTENT_WARNING": "Content trust settings here conflicts with the relevant project configuration that will override the settings here",
"PREHEAT_EXPLAIN": "Preheat will migrate the image to the p2p network",
- "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab"
+ "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab",
+ "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote provider uses a self-signed or untrusted certificate.",
+ "NAME_TOOLTIP": "Policy name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
+ "NEED_HELP": "Please ask your system admin to add a provider first"
}
}
diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json
index 2a4ea2701..60833b7a6 100644
--- a/src/portal/src/i18n/lang/tr-tr-lang.json
+++ b/src/portal/src/i18n/lang/tr-tr-lang.json
@@ -1474,7 +1474,7 @@
"UPDATE_FAILED": "Updating instance failed",
"REQUEST_PREHEAT_SUCCESS": "Preheat request successfully",
"REQUEST_PREHEAT_FAILED": "Preheat request failed",
- "DESCRIPTION": "description",
+ "DESCRIPTION": "Description",
"AUTH_MODE": "Auth Mode",
"USERNAME": "Username",
"PASSWORD": "Password",
@@ -1567,6 +1567,9 @@
"TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **",
"CONTENT_WARNING": "Content trust settings here conflicts with the relevant project configuration that will override the settings here",
"PREHEAT_EXPLAIN": "Preheat will migrate the image to the p2p network",
- "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab"
+ "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab",
+ "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote provider uses a self-signed or untrusted certificate.",
+ "NAME_TOOLTIP": "Policy name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
+ "NEED_HELP": "Please ask your system admin to add a provider first"
}
}
diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
index af6a5da86..770b87737 100644
--- a/src/portal/src/i18n/lang/zh-cn-lang.json
+++ b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -1564,6 +1564,9 @@
"TAG_SEPARATOR": "使用逗号分割 tags,tag* 和 **",
"CONTENT_WARNING": "内容信任设置与项目设置冲突且将会被项目设置覆盖",
"PREHEAT_EXPLAIN": "预热功能可加载镜像至 P2P 网络",
- "CRITERIA_EXPLAIN": "由项目设置下的'部署安全'项所指定"
+ "CRITERIA_EXPLAIN": "由项目设置下的'部署安全'项所指定",
+ "SKIP_CERT_VERIFY": "当远端服务使用自签或不可信证书时可勾选此项以跳过证书认证。",
+ "DESTINATION_NAME_TOOLTIP": "策略名称由小写字符、数字和._-/组成且至少2个字符并以字符或者数字开头。",
+ "NEED_HELP": "请先让您的系统管理员添加提供商"
}
}
diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json
index 2f1f2e7ed..1374c74c5 100644
--- a/src/portal/src/i18n/lang/zh-tw-lang.json
+++ b/src/portal/src/i18n/lang/zh-tw-lang.json
@@ -1458,7 +1458,7 @@
"UPDATE_FAILED": "Updating instance failed",
"REQUEST_PREHEAT_SUCCESS": "Preheat request successfully",
"REQUEST_PREHEAT_FAILED": "Preheat request failed",
- "DESCRIPTION": "description",
+ "DESCRIPTION": "Description",
"AUTH_MODE": "Auth Mode",
"USERNAME": "Username",
"PASSWORD": "Password",
@@ -1551,6 +1551,9 @@
"TAG_SEPARATOR": "Enter multiple comma separated tags,tag*,or **",
"CONTENT_WARNING": "Content trust settings here conflicts with the relevant project configuration that will override the settings here",
"PREHEAT_EXPLAIN": "Preheat will migrate the image to the p2p network",
- "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab"
+ "CRITERIA_EXPLAIN": "As specified in 'Deployment security' section under Configuration tab",
+ "SKIP_CERT_VERIFY": "Check this box to skip certificate verification when the remote provider uses a self-signed or untrusted certificate.",
+ "NAME_TOOLTIP": "Policy name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
+ "NEED_HELP": "Please ask your system admin to add a provider first"
}
}
diff --git a/src/portal/src/lib/components/endpoint/endpoint.component.html b/src/portal/src/lib/components/endpoint/endpoint.component.html
index ef0787c91..fe66f2815 100644
--- a/src/portal/src/lib/components/endpoint/endpoint.component.html
+++ b/src/portal/src/lib/components/endpoint/endpoint.component.html
@@ -27,10 +27,11 @@
{{'DESTINATION.PLACEHOLDER' | translate }}{{t.name}}
-
-