diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index 6ac9b6d6f..ac5852abb 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -658,7 +658,8 @@ "DELETED_FAILED": "Deleted endpoints failed.", "CANNOT_EDIT": "Endpoint cannot be changed while the replication rule is enabled.", "FAILED_TO_DELETE_TARGET_IN_USED": "Failed to delete the endpoint in use.", - "PLACEHOLDER": "We couldn't find any endpoints!" + "PLACEHOLDER": "We couldn't find any endpoints!", + "DEPRECATED": "Helm Hub is moving to Artifact Hub" }, "REPOSITORY": { "COPY_DIGEST_ID": "Copy Digest", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index cc7607829..514028cb9 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -659,7 +659,8 @@ "DELETED_FAILED": "Ha fallado la eliminación del endpoint.", "CANNOT_EDIT": "El endpoint no puede ser cambiado mientras la regla de replicación está activa.", "FAILED_TO_DELETE_TARGET_IN_USED": "Fallo al eliminar el endpoint en uso.", - "PLACEHOLDER": "We couldn't find any endpoints!" + "PLACEHOLDER": "We couldn't find any endpoints!", + "DEPRECATED": "Helm Hub is moving to Artifact Hub" }, "REPOSITORY": { "COPY_DIGEST_ID": "Copy Digest", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 790522503..853261a18 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -647,7 +647,8 @@ "DELETED_FAILED": "Echec de la suppression du point final", "CANNOT_EDIT": "Le point final ne peut pas être modifié tant que la règle de réplication est activée.", "FAILED_TO_DELETE_TARGET_IN_USED": "Echec de la suppression du point final en cours d'utilisation", - "PLACEHOLDER": "Nous n'avons trouvé aucun point final !" + "PLACEHOLDER": "Nous n'avons trouvé aucun point final !", + "DEPRECATED": "Helm Hub is moving to Artifact Hub" }, "REPOSITORY": { "COPY_DIGEST_ID": "Copier le Résumé", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 0d9f5c44c..8f059101f 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -658,7 +658,8 @@ "DELETED_FAILED": "Falha em endpoints removidos.", "CANNOT_EDIT": "Endpoint não pode ser alterado enquando a regra de replicação estiver ativa.", "FAILED_TO_DELETE_TARGET_IN_USED": "Falha ao remover endpoint em uso.", - "PLACEHOLDER": "Não foi possível encontrar nenhum endpoint!" + "PLACEHOLDER": "Não foi possível encontrar nenhum endpoint!", + "DEPRECATED": "Helm Hub is moving to Artifact Hub" }, "REPOSITORY": { "COPY_DIGEST_ID": "Copiar Digest", diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index 96dccacb3..cf222e8bc 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -658,7 +658,8 @@ "DELETED_FAILED": "Silinen uç noktalar başarısız oldu.", "CANNOT_EDIT": "Çoğaltma kuralı etkinken uç noktası değiştirilemez.", "FAILED_TO_DELETE_TARGET_IN_USED": "Kullanılan uç nokta silinemedi.", - "PLACEHOLDER": "Uç noktaları bulamadık!" + "PLACEHOLDER": "Uç noktaları bulamadık!", + "DEPRECATED": "Helm Hub is moving to Artifact Hub" }, "REPOSITORY": { "COPY_DIGEST_ID": "Özet Kopyala", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 60076cc86..4f7f532d9 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -659,7 +659,8 @@ "DELETED_FAILED": "删除目标失败。", "CANNOT_EDIT": "当复制规则启用时目标无法修改。", "FAILED_TO_DELETE_TARGET_IN_USED": "无法删除正在使用的目标。", - "PLACEHOLDER": "未发现任何复制目标!" + "PLACEHOLDER": "未发现任何复制目标!", + "DEPRECATED": "Helm Hub 正被移至 Artifact Hub" }, "REPOSITORY": { "COPY_DIGEST_ID": "复制摘要", diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json index efd9e959d..dafca3b51 100644 --- a/src/portal/src/i18n/lang/zh-tw-lang.json +++ b/src/portal/src/i18n/lang/zh-tw-lang.json @@ -655,7 +655,8 @@ "DELETED_FAILED": "刪除目標失敗。", "CANNOT_EDIT": "當複制規則啟用時目標無法修改。", "FAILED_TO_DELETE_TARGET_IN_USED": "無法刪除正在使用的目標。", - "PLACEHOLDER": "未發現任何復制目標!" + "PLACEHOLDER": "未發現任何復制目標!", + "DEPRECATED": "Helm Hub is moving to Artifact Hub" }, "REPOSITORY":{ "COPY_DIGEST_ID": "複製摘要", diff --git a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.html b/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.html index 62682e828..49a5e706a 100644 --- a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.html +++ b/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.html @@ -14,7 +14,7 @@ diff --git a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.scss b/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.scss index 33be772fd..5b7b8ef9a 100644 --- a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.scss +++ b/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.scss @@ -64,3 +64,6 @@ display: flex; align-items: center; } + .hidden{ + display:none; + } \ No newline at end of file diff --git a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.ts b/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.ts index 04b7c2d8a..e7adc9d04 100644 --- a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.ts +++ b/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.ts @@ -25,7 +25,7 @@ import { NgForm } from "@angular/forms"; import { Subscription, throwError as observableThrowError } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; -import { EndpointService } from "../../services/endpoint.service"; +import {EndpointService, HELM_HUB} from "../../services/endpoint.service"; import { ErrorHandler } from "../../utils/error-handler"; import { InlineAlertComponent } from "../inline-alert/inline-alert.component"; import { Endpoint, PingEndpoint } from "../../services/interface"; @@ -37,7 +37,6 @@ import { AppConfigService } from '../../../app/services/app-config.service'; const FAKE_PASSWORD = "rjGcfuRu"; const FAKE_JSON_KEY = "No Change"; const METADATA_URL = CURRENT_BASE_HREF + "/replication/adapterinfos"; -const HELM_HUB = "helm-hub"; const FIXED_PATTERN_TYPE: string = "EndpointPatternTypeFix"; @Component({ selector: "hbr-create-edit-endpoint", @@ -485,4 +484,8 @@ export class CreateEditEndpointComponent getAdapterText(adapter: string): string { return this.endpointService.getAdapterText(adapter); } + // hide helm hub option when creating registry + shouldHide(adapter: string) { + return adapter === HELM_HUB && !this.endpointId; + } } diff --git a/src/portal/src/lib/components/endpoint/endpoint.component.html b/src/portal/src/lib/components/endpoint/endpoint.component.html index 87a5092f7..e7a024742 100644 --- a/src/portal/src/lib/components/endpoint/endpoint.component.html +++ b/src/portal/src/lib/components/endpoint/endpoint.component.html @@ -34,7 +34,17 @@ {{t.url}} - {{getAdapterText(t.type)}} + + {{getAdapterText(t.type)}} + + + + {{'DESTINATION.DEPRECATED' | translate}} + + + {{!t.insecure}} diff --git a/src/portal/src/lib/components/endpoint/endpoint.component.scss b/src/portal/src/lib/components/endpoint/endpoint.component.scss index 5a6a57f0d..17982de08 100644 --- a/src/portal/src/lib/components/endpoint/endpoint.component.scss +++ b/src/portal/src/lib/components/endpoint/endpoint.component.scss @@ -29,4 +29,7 @@ .flex-min-width { min-width: 180px; +} +.margin-right-2px { + margin-right: 2px; } \ No newline at end of file diff --git a/src/portal/src/lib/components/endpoint/endpoint.component.ts b/src/portal/src/lib/components/endpoint/endpoint.component.ts index eb32c1d31..c72fd99d3 100644 --- a/src/portal/src/lib/components/endpoint/endpoint.component.ts +++ b/src/portal/src/lib/components/endpoint/endpoint.component.ts @@ -24,7 +24,7 @@ import { TranslateService } from "@ngx-translate/core"; import { Comparator } from "../../services/interface"; import { Endpoint } from "../../services/interface"; -import { EndpointService } from "../../services/endpoint.service"; +import {EndpointService, HELM_HUB} from "../../services/endpoint.service"; import { ErrorHandler } from "../../utils/error-handler"; import { map, catchError, finalize } from "rxjs/operators"; @@ -243,4 +243,7 @@ export class EndpointComponent implements OnInit, OnDestroy { getAdapterText(adapter: string): string { return this.endpointService.getAdapterText(adapter); } + isHelmHub(str: string): boolean { + return str === HELM_HUB; + } } diff --git a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.html b/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.html index 27e232447..ed35cf6e0 100644 --- a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.html +++ b/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.html @@ -1,5 +1,5 @@
- + @@ -63,7 +63,15 @@
- {{p.src_registry ? p.src_registry.name : ''}} + {{p.src_registry ? p.src_registry.name : ''}} + + + + {{'DESTINATION.DEPRECATED' | translate}} + + {{p.src_registry && p.src_registry.id > 0 ? 'pull-based' : 'push-based'}} diff --git a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.scss b/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.scss index ba7f5c7ea..ad5dc42be 100644 --- a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.scss +++ b/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.scss @@ -18,3 +18,6 @@ .icon-style { color: #C92100; } +.margin-right-2px { + margin-right: 2px; +} \ No newline at end of file diff --git a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.ts b/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.ts index 3f3cdc6c6..135435754 100644 --- a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.ts +++ b/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.ts @@ -21,7 +21,7 @@ import { import { TranslateService } from "@ngx-translate/core"; import { map, catchError, finalize } from "rxjs/operators"; import { Observable, forkJoin, throwError as observableThrowError } from "rxjs"; -import { ReplicationService } from "../../services"; +import {HELM_HUB, ReplicationService} from "../../services"; import { ReplicationRule } from "../../services"; @@ -257,4 +257,7 @@ export class ListReplicationRuleComponent { this.ruleName = ""; this.clrLoad(); } + isHelmHub(srcRegistry: any): boolean { + return srcRegistry && srcRegistry.type === HELM_HUB; + } } diff --git a/src/portal/src/lib/services/endpoint.service.ts b/src/portal/src/lib/services/endpoint.service.ts index 3d23356e5..6107cf9fe 100644 --- a/src/portal/src/lib/services/endpoint.service.ts +++ b/src/portal/src/lib/services/endpoint.service.ts @@ -22,11 +22,14 @@ const ADAPTERS_MAP = { "google-gcr": "Google GCR", "harbor": "Harbor", "helm-hub": "Helm Hub", + "artifact-hub": "Artifact Hub", "huawei-SWR": "Huawei SWR", "jfrog-artifactory": "JFrog Artifactory", "quay": "Quay" }; +export const HELM_HUB: string = "helm-hub"; + /**