Update the regex for policy name and the tooltip message

1. Fixes task 6 for goharbor#18091 Signed-off-by: AllForNothing <sshijun@vmware.com>
AllForNothing · Jul 19, 2023 · 42682fd · 42682fd
1 parent 82ee529
commit 42682fd
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html b/src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html
@@ -97,7 +97,7 @@ <h3 *ngIf="!isEdit" class="modal-title">
                             ">
                             <div class="clr-input-wrapper">
                                 <input
-                                    pattern="^[a-z0-9]+(?:[._-][a-z0-9]+)*$"
+                                    pattern="^[A-Za-z0-9]+(?:[._-][A-Za-z0-9]+)*$"
                                     [disabled]="loading"
                                     autocomplete="off"
                                     class="clr-input width-380"

diff --git a/src/portal/src/i18n/lang/de-de-lang.json b/src/portal/src/i18n/lang/de-de-lang.json
@@ -1593,7 +1593,7 @@
         "PREHEAT_EXPLAIN": "Aufwärmen wird das Image dem P2P Netzwerk hinzufügen",
         "CRITERIA_EXPLAIN": "Wie unter 'Deployment Sicherheit' im Konfiguration Tab",
         "SKIP_CERT_VERIFY": "Aktiviere die Checkbox, falls die Remote-Registry ein selbsigniertes oder nicht-vertrauenswürdiges Zertifikat verwendet.",
-        "NAME_TOOLTIP": "Der Name muss mindestens 2 Zeichen lang sein. Mit Kleinbuchstaben, Ziffern und ._-. Er muss mit Buchstaben oder Ziffern beginnen.",
+        "NAME_TOOLTIP": "Policy name consists of one or more groups of uppercase letter, lowercase letter or number; and groups are separated by a dot, underscore, or hyphen.",
         "NEED_HELP": "Bitte den Systemadministrator um das Hinzufügen eines Providers"
     },
     "PAGINATION": {

diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
@@ -1594,7 +1594,7 @@
         "PREHEAT_EXPLAIN": "Preheat will migrate the image to the p2p network",
         "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.",
+        "NAME_TOOLTIP": "Policy name consists of one or more groups of uppercase letter, lowercase letter or number; and groups are separated by a dot, underscore, or hyphen.",
         "NEED_HELP": "Please ask your system admin to add a provider first"
     },
     "PAGINATION": {

diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
@@ -1590,7 +1590,7 @@
         "PREHEAT_EXPLAIN": "Preheat will migrate the image to the p2p network",
         "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.",
+        "NAME_TOOLTIP": "Policy name consists of one or more groups of uppercase letter, lowercase letter or number; and groups are separated by a dot, underscore, or hyphen.",
         "NEED_HELP": "Please ask your system admin to add a provider first"
     },
     "PAGINATION": {

diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -1560,7 +1560,7 @@
         "PREHEAT_EXPLAIN": "Le préchauffage migrera l'image vers le réseau p2p",
         "CRITERIA_EXPLAIN": "Comme spécifié dans la section 'Sécurité de déploiement' dans l'onglet Configuration",
         "SKIP_CERT_VERIFY": "Cochez cette case pour ignorer la vérification du certificat lorsque le fournisseur distant utilise un certificat auto-signé ou non approuvé.",
-        "NAME_TOOLTIP": "Le nom de la stratégie doit comporter au moins 2 caractères avec des caractères minuscules, des chiffres et ._- et doit commencer par des caractères ou des chiffres.",
+        "NAME_TOOLTIP": "Policy name consists of one or more groups of uppercase letter, lowercase letter or number; and groups are separated by a dot, underscore, or hyphen.",
         "NEED_HELP": "Veuillez d'abord demander à votre administrateur système d'ajouter un fournisseur"
     },
     "PAGINATION": {

diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -1590,7 +1590,7 @@
         "PREHEAT_EXPLAIN": "Pré-análise torna suas imagens mais confiáveis perante a rede P2P",
         "CRITERIA_EXPLAIN": "Conforme especificado na 'Segurança da implantação', na aba Configurações.",
         "SKIP_CERT_VERIFY": "Marque para ignorar certificados inválidos ou auto-assinados.",
-        "NAME_TOOLTIP": "Nome da política deve ter no mínimo 2 caracteres. Pode conter ser composto de letras, números e dos símbolos ._- e deve começar com uma letra ou número.",
+        "NAME_TOOLTIP": "Policy name consists of one or more groups of uppercase letter, lowercase letter or number; and groups are separated by a dot, underscore, or hyphen.",
         "NEED_HELP": "Solicite ao administrador do sistema a inclusão de um fornecedor."
     },
     "PAGINATION": {

diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json
@@ -1593,7 +1593,7 @@
         "PREHEAT_EXPLAIN": "Preheat will migrate the image to the p2p network",
         "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.",
+        "NAME_TOOLTIP": "Policy name consists of one or more groups of uppercase letter, lowercase letter or number; and groups are separated by a dot, underscore, or hyphen.",
         "NEED_HELP": "Please ask your system admin to add a provider first"
     },
     "PAGINATION": {

diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -1590,7 +1590,7 @@
         "PREHEAT_EXPLAIN": "预热功能可加载镜像至 P2P 网络",
         "CRITERIA_EXPLAIN": "由项目设置下的'部署安全'项所指定",
         "SKIP_CERT_VERIFY": "当远端服务使用自签或不可信证书时可勾选此项以跳过证书认证。",
-        "NAME_TOOLTIP": "策略名称由小写字符、数字和._-/组成且至少2个字符并以字符或者数字开头。",
+        "NAME_TOOLTIP": "策略名称是一组或者多组由大小写字母或数字组成的字符串，多组字符串则由单个英文输入法下的点，下划线或者减号分隔开。",
         "NEED_HELP": "请先让您的系统管理员添加提供商"
     },
     "PAGINATION": {

diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json
@@ -1582,7 +1582,7 @@
     "PREHEAT_EXPLAIN": "預熱將把映像檔遷移到 P2P 網絡",
     "CRITERIA_EXPLAIN": "如配置標籤下 '部署安全性' 部分所指定",
     "SKIP_CERT_VERIFY": "遠端提供者使用自簽名或不受信任的憑證時，勾選此框以跳過憑證驗證。",
-    "NAME_TOOLTIP": "策略名稱應至少包含2個字元，使用小寫字母、數字和 ._-，並且必須以字母或數字開頭。",
+    "NAME_TOOLTIP": "Policy name consists of one or more groups of uppercase letter, lowercase letter or number; and groups are separated by a dot, underscore, or hyphen.",
     "NEED_HELP": "請向您的系統管理員尋求幫助以先新增一個供應商"
   },
   "PAGINATION": {