From cc05a60ec582bbce25d13079b1e4753c2108fa71 Mon Sep 17 00:00:00 2001 From: AllForNothing Date: Thu, 23 Jul 2020 18:04:03 +0800 Subject: [PATCH] Fix ui bugs with label target2.1.0 Signed-off-by: AllForNothing --- .../app/project/create-project/create-project.component.ts | 4 +++- src/portal/src/i18n/lang/es-es-lang.json | 4 ++++ src/portal/src/i18n/lang/fr-fr-lang.json | 4 ++++ src/portal/src/i18n/lang/pt-br-lang.json | 4 ++++ src/portal/src/i18n/lang/tr-tr-lang.json | 4 ++++ src/portal/src/i18n/lang/zh-cn-lang.json | 4 ++++ src/portal/src/i18n/lang/zh-tw-lang.json | 4 ++++ .../config/project-quotas/project-quotas.component.ts | 2 +- 8 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/portal/src/app/project/create-project/create-project.component.ts b/src/portal/src/app/project/create-project/create-project.component.ts index facc4a5b1..4b4d35496 100644 --- a/src/portal/src/app/project/create-project/create-project.component.ts +++ b/src/portal/src/app/project/create-project/create-project.component.ts @@ -84,7 +84,9 @@ export class CreateProjectComponent implements OnInit, AfterViewInit, OnChanges } ngOnInit(): void { - this.getRegistries(); + if (this.isSystemAdmin) { + this.getRegistries(); + } } getRegistries() { diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index e91916ac0..a0cac803f 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -102,6 +102,8 @@ "OIDC_VERIFYCERT": "Desmarque esta casilla si tu OIDC servidor está alojado a través de certificado autofirmado.", "OIDC_GROUP_CLAIM": "The name of Claim in the ID token whose value is the list of group names.", "OIDC_GROUP_CLAIM_WARNING": "It can only contain letters, numbers, underscores, and the input length is no more than 256 characters.", + "OIDC_AUTOONBOARD": "Skip the onboarding screen, so user cannot change its username. Username is provided from ID Token", + "OIDC_USER_CLAIM": "The name of the claim in the ID Token where the username is retrieved from. If not specified, it will default to 'name'", "NEW_SECRET": "The secret must longer than 8 chars with at least 1 uppercase letter, 1 lowercase letter and 1 number." }, "PLACEHOLDER": { @@ -911,6 +913,8 @@ "CLIENTSECRET": "OIDC Client Secret", "SCOPE": "OIDC Ámbito", "OIDC_VERIFYCERT": "Verificar certificado", + "OIDC_AUTOONBOARD": "Automatic onboarding", + "USER_CLAIM": "Username Claim", "OIDC_SETNAME": "Set OIDC nombre de usuario", "OIDC_SETNAMECONTENT": "Usted debe crear un Harbor nombre de usuario la primera vez cuando la autenticación a través de un tercero (OIDC). Esta será usada en Harbor para ser asociados con proyectos, funciones, etc.", "OIDC_USERNAME": "Usuario", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 9be671116..fffd444f2 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -97,6 +97,8 @@ "OIDC_VERIFYCERT": "décocher cette case si votre oidc serveur est accueilli par auto - certificat signé.", "OIDC_GROUP_CLAIM": "The name of Claim in the ID token whose value is the list of group names.", "OIDC_GROUP_CLAIM_WARNING": "It can only contain letters, numbers, underscores, and the input length is no more than 256 characters.", + "OIDC_AUTOONBOARD": "Skip the onboarding screen, so user cannot change its username. Username is provided from ID Token", + "OIDC_USER_CLAIM": "The name of the claim in the ID Token where the username is retrieved from. If not specified, it will default to 'name'", "NEW_SECRET": "The secret must longer than 8 chars with at least 1 uppercase letter, 1 lowercase letter and 1 number." }, "PLACEHOLDER": { @@ -884,6 +886,8 @@ "CLIENTSECRET": "OIDC Client Secret", "SCOPE": "OIDC Scope", "OIDC_VERIFYCERT": "Certificat vérifier", + "OIDC_AUTOONBOARD": "Automatic onboarding", + "USER_CLAIM": "Username Claim", "OIDC_SETNAME": "Ensemble OIDC nom d'utilisateur", "OIDC_SETNAMECONTENT": "vous devez créer un Harbor identifiant la première fois lors de la vérification par une tierce partie (oidc). il sera utilisé au sein de port à être associés aux projets, des rôles, etc.", "OIDC_USERNAME": "d'utilisateur", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 85f1dd3fa..129475ccc 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -100,6 +100,8 @@ "OIDC_VERIFYCERT": "Desmarque esta opção se o SEU servidor está hospedado oidc via self - signed certificate.", "OIDC_GROUP_CLAIM": "The name of Claim in the ID token whose value is the list of group names.", "OIDC_GROUP_CLAIM_WARNING": "It can only contain letters, numbers, underscores, and the input length is no more than 256 characters.", + "OIDC_AUTOONBOARD": "Skip the onboarding screen, so user cannot change its username. Username is provided from ID Token", + "OIDC_USER_CLAIM": "The name of the claim in the ID Token where the username is retrieved from. If not specified, it will default to 'name'", "NEW_SECRET": "The secret must longer than 8 chars with at least 1 uppercase letter, 1 lowercase letter and 1 number." }, "PLACEHOLDER": { @@ -907,6 +909,8 @@ "CLIENTSECRET": "OIDC Client Secret", "SCOPE": "Escopo OIDC", "OIDC_VERIFYCERT": "Verificar Certificado", + "OIDC_AUTOONBOARD": "Automatic onboarding", + "USER_CLAIM": "Username Claim", "OIDC_SETNAME": "Definir o Utilizador OIDC", "OIDC_SETNAMECONTENT": "Você deve Criar um Nome de usuário do Porto a primeira vez que autenticar através de um terceiro (OIDC). Isto será usado Dentro de Harbor para ser associado a projetos, papéis, etc.", "OIDC_USERNAME": "Utilizador", diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index daf02cc9e..7a5db70b6 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -102,6 +102,8 @@ "OIDC_VERIFYCERT": "OIDC sunucunuz kendinden imzalı sertifika ile barındırılıyorsa bu kutunun işaretini kaldırın.", "OIDC_GROUP_CLAIM": "The name of Claim in the ID token whose value is the list of group names.", "OIDC_GROUP_CLAIM_WARNING": "It can only contain letters, numbers, underscores, and the input length is no more than 256 characters.", + "OIDC_AUTOONBOARD": "Skip the onboarding screen, so user cannot change its username. Username is provided from ID Token", + "OIDC_USER_CLAIM": "The name of the claim in the ID Token where the username is retrieved from. If not specified, it will default to 'name'", "NEW_SECRET": "The secret must longer than 8 chars with at least 1 uppercase letter, 1 lowercase letter and 1 number." }, "PLACEHOLDER": { @@ -911,6 +913,8 @@ "CLIENTSECRET": "OIDC Alıcı Şifresi", "SCOPE": "OIDC Kapsamı", "OIDC_VERIFYCERT": "Sertifikayı Doğrula", + "OIDC_AUTOONBOARD": "Automatic onboarding", + "USER_CLAIM": "Username Claim", "OIDC_SETNAME": "OIDC Kullanıcı Adını Ayarla", "OIDC_SETNAMECONTENT": "Üçüncü tarafla (OIDC) kimlik doğrulaması yaparken ilk kez bir Harbor kullanıcı adı oluşturmalısınız. Bu, harbor projeler, roller vb. ile ilişkilendirilmek üzere kullanılacaktır.", "OIDC_USERNAME": "Kullanıcı Adı", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 37720a26f..2bdb7ebe7 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -101,6 +101,8 @@ "OIDC_VERIFYCERT": "如果您的OIDC服务器是通过自签名证书托管的，请取消选中此框。", "OIDC_GROUP_CLAIM": "ID和token中的Claim名称，在组的名称列表中。", "OIDC_GROUP_CLAIM_WARNING": "它只能包含字母、数字、下划线,且输入长度不超过256字符。", + "OIDC_AUTOONBOARD": "跳过登录界面，这样用户就不能更改其用户名。用户名是从ID令牌中获取的", + "OIDC_USER_CLAIM": "指定从ID令牌中获取的名称。如果未指定，则默认为'name'", "NEW_SECRET": "Cli secret 必须超过8个字符，并至少包含1个大写字母，1个小写字母和1个数字。" }, "PLACEHOLDER": { @@ -911,6 +913,8 @@ "CLIENTSECRET": "OIDC 客户端密码", "SCOPE": "OIDC Scope", "OIDC_VERIFYCERT": "验证证书", + "OIDC_AUTOONBOARD": "自动登录", + "USER_CLAIM": "用户名声明", "OIDC_SETNAME": "设置OIDC用户名", "OIDC_SETNAMECONTENT": "在通过第三方（OIDC）进行身份验证时，您必须第一次创建一个Harbor用户名。这将在Harbor中用于与项目、角色等关联。", "OIDC_USERNAME": "用户名", diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json index adec4b9cd..3ebbf3f3d 100644 --- a/src/portal/src/i18n/lang/zh-tw-lang.json +++ b/src/portal/src/i18n/lang/zh-tw-lang.json @@ -101,6 +101,8 @@ "OIDC_VERIFYCERT": "如果您的OIDC服務器是通過自簽名證書託管的,請取消選中此框。", "OIDC_GROUP_CLAIM": "ID和token中的Claim名稱,在組的名稱列表中。", "OIDC_GROUP_CLAIM_WARNING": "它只能包含字母、數字、下劃線,且輸入長度不超過256字符。", + "OIDC_AUTOONBOARD": "Skip the onboarding screen, so user cannot change its username. Username is provided from ID Token", + "OIDC_USER_CLAIM": "The name of the claim in the ID Token where the username is retrieved from. If not specified, it will default to 'name'", "NEW_SECRET": "Cli secret 必須超過8個字符,並至少包含1個大寫字母,1個小寫字母和1個數字。" }, "PLACEHOLDER":{ @@ -906,6 +908,8 @@ "CLIENTSECRET": "OIDC 客戶端密碼", "SCOPE":"OIDC範圍", "OIDC_VERIFYCERT": "驗證證書", + "OIDC_AUTOONBOARD": "Automatic onboarding", + "USER_CLAIM": "Username Claim", "OIDC_SETNAME": "設置OIDC用戶名", "OIDC_SETNAMECONTENT": "在通過第三方（OIDC）進行身份驗證時,您必須第一次創建一個Harbor用戶名。這將在端口中用於與項目、角色等關聯。", "OIDC_USERNAME": "用戶名", diff --git a/src/portal/src/lib/components/config/project-quotas/project-quotas.component.ts b/src/portal/src/lib/components/config/project-quotas/project-quotas.component.ts index 06bb159fc..944b007d2 100644 --- a/src/portal/src/lib/components/config/project-quotas/project-quotas.component.ts +++ b/src/portal/src/lib/components/config/project-quotas/project-quotas.component.ts @@ -220,7 +220,7 @@ export class ProjectQuotasComponent implements OnChanges { } goToLink(proId) { - let linkUrl = ["harbor", "projects", proId, "summary"]; + let linkUrl = ["harbor", "projects", proId]; this.router.navigate(linkUrl); } refresh() {