diff --git a/packages/manager/apps/dedicated/client/app/account/user/security/user-security.controller.js b/packages/manager/apps/dedicated/client/app/account/user/security/user-security.controller.js index 15df487986aa..af8b1ba145bf 100644 --- a/packages/manager/apps/dedicated/client/app/account/user/security/user-security.controller.js +++ b/packages/manager/apps/dedicated/client/app/account/user/security/user-security.controller.js @@ -13,6 +13,7 @@ export default [ 'UserAccount.services.doubleAuth.u2f', 'UserAccount.services.doubleAuth.backupCode', 'Alerter', + 'coreConfig', function UserAccountDoubleAuthController( $scope, $q, @@ -22,13 +23,18 @@ export default [ DoubleAuthU2fService, DoubleAuthBackupCodeService, Alerter, + coreConfig, ) { + const { + auth: { method: authMethod }, + } = coreConfig.getUser(); $scope.doubleAuth = { sms: 'disabled', totp: 'disabled', u2f: 'disabled', backupCode: 'disabled', isLoading: false, + isConnectionSSO: authMethod === 'provider', }; /* =============================== diff --git a/packages/manager/apps/dedicated/client/app/account/user/security/user-security.html b/packages/manager/apps/dedicated/client/app/account/user/security/user-security.html index f52b598ec81e..ac961937faf3 100644 --- a/packages/manager/apps/dedicated/client/app/account/user/security/user-security.html +++ b/packages/manager/apps/dedicated/client/app/account/user/security/user-security.html @@ -82,22 +82,36 @@ >
-

+
+

- - - + + + +
+
+

+ + + +
+49 (0) 681 906730. Vielen Dank für Ihr Verständnis.", "core_pcc_top_guide_11_title": "Offizielle Dokumentation zu Nutanix", "older_interface": "Altes Kundeninterface", - "core_pcc_top_guide_12_title": "Offizielle Dokumentation zu SAP HANA on Private Cloud" + "core_pcc_top_guide_12_title": "Offizielle Dokumentation zu SAP HANA on Private Cloud", + "core_pcc_top_guide_13_title": "IPs die Verbindung zum vCenter erlauben" } diff --git a/packages/manager/apps/dedicated/client/app/common/translations/Messages_en_GB.json b/packages/manager/apps/dedicated/client/app/common/translations/Messages_en_GB.json index 3284b906c292..3f060c82cb6e 100644 --- a/packages/manager/apps/dedicated/client/app/common/translations/Messages_en_GB.json +++ b/packages/manager/apps/dedicated/client/app/common/translations/Messages_en_GB.json @@ -545,5 +545,6 @@ "common_unavailable_information": "Information unavailable", "common_resiliate_contact_support": "To cancel this service, please call our support team on: 0333 370 0425. Thank you for choosing OVH.", "core_pcc_top_guide_11_title": "Nutanix official documentation", - "core_pcc_top_guide_12_title": "SAP HANA on Private Cloud official documentation" + "core_pcc_top_guide_12_title": "SAP HANA on Private Cloud official documentation", + "core_pcc_top_guide_13_title": "Authorise IPs to connect to vCenter" } diff --git a/packages/manager/apps/dedicated/client/app/common/translations/Messages_es_ES.json b/packages/manager/apps/dedicated/client/app/common/translations/Messages_es_ES.json index 906b73c931c8..ced65899a29c 100644 --- a/packages/manager/apps/dedicated/client/app/common/translations/Messages_es_ES.json +++ b/packages/manager/apps/dedicated/client/app/common/translations/Messages_es_ES.json @@ -545,5 +545,6 @@ "common_unavailable_information": "Información no disponible", "common_resiliate_contact_support": "Para dar de baja este servicio, puede ponerse en contacto con nuestro Soporte en el 91 758 34 77. ¡Gracias por su comprensión!", "core_pcc_top_guide_11_title": "Documentación oficial de Nutanix", - "core_pcc_top_guide_12_title": "Documentación oficial de SAP HANA on Private Cloud" + "core_pcc_top_guide_12_title": "Documentación oficial de SAP HANA on Private Cloud", + "core_pcc_top_guide_13_title": "Autorizar las direcciones IP a conectarse al vCenter" } diff --git a/packages/manager/apps/dedicated/client/app/common/translations/Messages_fr_CA.json b/packages/manager/apps/dedicated/client/app/common/translations/Messages_fr_CA.json index d2cad2a875ad..7e63c5cc6029 100644 --- a/packages/manager/apps/dedicated/client/app/common/translations/Messages_fr_CA.json +++ b/packages/manager/apps/dedicated/client/app/common/translations/Messages_fr_CA.json @@ -487,6 +487,7 @@ "core_pcc_top_guide_10_title": "Documentation officielle de NSX", "core_pcc_top_guide_11_title": "Documentation officielle de Nutanix", "core_pcc_top_guide_12_title": "Documentation officielle de SAP HANA on Private Cloud", + "core_pcc_top_guide_13_title": "Autoriser des IP à se connecter au vCenter", "sso_modal_title": "OVH - Authentification", "sso_modal_loading": "Chargement...", "sso_modal_user_title": "Vous étiez connecté en tant que :", diff --git a/packages/manager/apps/dedicated/client/app/common/translations/Messages_fr_FR.json b/packages/manager/apps/dedicated/client/app/common/translations/Messages_fr_FR.json index d2cad2a875ad..7e63c5cc6029 100644 --- a/packages/manager/apps/dedicated/client/app/common/translations/Messages_fr_FR.json +++ b/packages/manager/apps/dedicated/client/app/common/translations/Messages_fr_FR.json @@ -487,6 +487,7 @@ "core_pcc_top_guide_10_title": "Documentation officielle de NSX", "core_pcc_top_guide_11_title": "Documentation officielle de Nutanix", "core_pcc_top_guide_12_title": "Documentation officielle de SAP HANA on Private Cloud", + "core_pcc_top_guide_13_title": "Autoriser des IP à se connecter au vCenter", "sso_modal_title": "OVH - Authentification", "sso_modal_loading": "Chargement...", "sso_modal_user_title": "Vous étiez connecté en tant que :", diff --git a/packages/manager/apps/dedicated/client/app/common/translations/Messages_it_IT.json b/packages/manager/apps/dedicated/client/app/common/translations/Messages_it_IT.json index 48fcc8a5b4ad..636282fe0b3c 100644 --- a/packages/manager/apps/dedicated/client/app/common/translations/Messages_it_IT.json +++ b/packages/manager/apps/dedicated/client/app/common/translations/Messages_it_IT.json @@ -545,5 +545,6 @@ "common_unavailable_information": "Informazione non disponibile", "common_resiliate_contact_support": "Per disattivare questo servizio, contatta il nostro supporto tecnico al numero 02 5560 0423 o apri un ticket.", "core_pcc_top_guide_11_title": "Documentazione ufficiale di Nutanix", - "core_pcc_top_guide_12_title": "Documentazione ufficiale di SAP HANA on Private Cloud" + "core_pcc_top_guide_12_title": "Documentazione ufficiale di SAP HANA on Private Cloud", + "core_pcc_top_guide_13_title": "Autorizzare IP a connettersi al vCenter" } diff --git a/packages/manager/apps/dedicated/client/app/common/translations/Messages_pl_PL.json b/packages/manager/apps/dedicated/client/app/common/translations/Messages_pl_PL.json index 84aa45aac6e7..840e0c09750f 100644 --- a/packages/manager/apps/dedicated/client/app/common/translations/Messages_pl_PL.json +++ b/packages/manager/apps/dedicated/client/app/common/translations/Messages_pl_PL.json @@ -545,5 +545,6 @@ "common_unavailable_information": "Informacja niedostępna", "common_resiliate_contact_support": "Aby zrezygnować z tej usługi, skontaktuj się z Pomocą techniczną. Zadzwoń na numer: 71 750 02 00 i wybierz 3. Dziękujemy za wyrozumiałość.", "core_pcc_top_guide_11_title": "Oficjalna dokumentacja Nutanix", - "core_pcc_top_guide_12_title": "Oficjalna dokumentacja SAP HANA on Private Cloud" + "core_pcc_top_guide_12_title": "Oficjalna dokumentacja SAP HANA on Private Cloud", + "core_pcc_top_guide_13_title": "Autoryzacja adresów IP, które mogą łączyć się z vCenter" } diff --git a/packages/manager/apps/dedicated/client/app/common/translations/Messages_pt_PT.json b/packages/manager/apps/dedicated/client/app/common/translations/Messages_pt_PT.json index 0c4c0737f048..c1156892727d 100644 --- a/packages/manager/apps/dedicated/client/app/common/translations/Messages_pt_PT.json +++ b/packages/manager/apps/dedicated/client/app/common/translations/Messages_pt_PT.json @@ -545,5 +545,6 @@ "common_unavailable_information": "Informação indisponível", "common_resiliate_contact_support": "Para cancelar este serviço, contacte o nosso apoio ao cliente através do +351 213 155 642. Obrigado pela sua compreensão.", "core_pcc_top_guide_11_title": "Documentação oficial da Nutanix", - "core_pcc_top_guide_12_title": "Documentação oficial do SAP HANA on Private Cloud" + "core_pcc_top_guide_12_title": "Documentação oficial do SAP HANA on Private Cloud", + "core_pcc_top_guide_13_title": "Autorizar endereços IP a ligar-se ao vCenter" } diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ip-ip-agoraOrder.controller.js b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ip-ip-agoraOrder.controller.js index 586692e5b721..1d2b4b5878b8 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ip-ip-agoraOrder.controller.js +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ip-ip-agoraOrder.controller.js @@ -31,7 +31,7 @@ export default class AgoraIpOrderCtrl { } getlowestPrice() { - const plans = this.ipCatalog.filter((plan) => + const plans = this.ipCatalog?.filter((plan) => Object.values(IP_FAILOVER_PLANCODE).includes(plan.planCode), ); plans.forEach( diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ip-ip-agoraOrder.service.js b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ip-ip-agoraOrder.service.js index b6f0e5525f67..01434d5e0fe3 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ip-ip-agoraOrder.service.js +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ip-ip-agoraOrder.service.js @@ -42,6 +42,7 @@ export default class IpAgoraOrder { pricingMode = 'default', quantity = 1, serviceName, + datacenter, }) { const productToOrder = { configuration, @@ -51,6 +52,7 @@ export default class IpAgoraOrder { productId, quantity, serviceName, + datacenter, }; if (description) { @@ -95,6 +97,13 @@ export default class IpAgoraOrder { }); } + if (datacenter) { + productToOrder.configuration.push({ + label: 'datacenter', + value: datacenter, + }); + } + return productToOrder; } } diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.constant.js b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.constant.js index 44f3293a1997..5eb781b9e030 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.constant.js +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.constant.js @@ -20,6 +20,10 @@ export const PRODUCT_TYPES = { apiTypeName: 'VPS', typeName: 'VPS', }, + parking: { + apiTypeName: 'parking', + typeName: 'parking', + }, }; export const IP_AGORA = { @@ -67,6 +71,56 @@ export const BLOCK_ADDITIONAL_IP = 'Block Additional IP'; export { TRACKING_PREFIX, ADDITIONAL_IP, ALERT_ID, IP_FAILOVER_PLANCODE }; +export const DATACENTER_TO_COUNTRY = { + PAR: 'fr', + GRA: 'fr', + SBG: 'fr', + LIM: 'de', + WAW: 'pl', + ERI: 'uk', + VIN: 'us', + HIL: 'us', + BHS: 'ca', + SGP: 'sg', + SYD: 'au', + RBX: 'fr', + YYZ: 'ca', + YNM: 'in', + CR2: 'fr', +}; + +export const DATACENTER_TO_REGION = { + RBX: 'eu-west-rbx', + GRA: 'eu-west-gra', + SBG: 'eu-west-sbg', + PAR: 'eu-west-par', + CR2: 'labeu-west-1-preprod', + LIM: 'eu-west-lim', + WAW: 'eu-central-waw', + ERI: 'eu-west-eri', + BHS: 'ca-east-bhs', + YYZ: 'ca-east-tor', + SGP: 'ap-southeast-sgp', + SYD: 'ap-southeast-syd', + YNM: 'ap-south-mum', + VIN: 'us-east-vin', + HIL: 'us-west-hil', +}; + +export const IP_LOCATION_GROUPS_BASED_ON_DATACENTER = [ + { + labels: ['APAC/CANADA', 'CANADA - ASIA'], + countries: ['au', 'ca', 'sg', 'in'], + datacenter: ['SYD', 'BHS', 'YYZ', 'YNM', 'SGP'], + }, + { + labels: ['EUROPE'], + countries: ['de', 'fr', 'pl', 'uk'], + datacenter: ['RBX', 'GRA', 'LIM', 'CR2', 'PAR', 'SBG', 'WAW', 'ERI'], + }, + { labels: ['USA'], countries: ['us'], datacenter: ['HIL', 'VIN'] }, +]; + export default { FETCH_PRICE_MAX_TRIES, IP_LOCATION_GROUPS, @@ -77,4 +131,7 @@ export default { IP_FAILOVER_PLANCODE, BLOCK_ADDITIONAL_IP, ALERT_ID, + DATACENTER_TO_COUNTRY, + DATACENTER_TO_REGION, + IP_LOCATION_GROUPS_BASED_ON_DATACENTER, }; diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.controller.js b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.controller.js index a8875d1ac90d..89d64e0e815f 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.controller.js +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.controller.js @@ -25,6 +25,9 @@ import { BLOCK_ADDITIONAL_IP, IP_FAILOVER_PLANCODE, ALERT_ID, + DATACENTER_TO_COUNTRY, + DATACENTER_TO_REGION, + IP_LOCATION_GROUPS_BASED_ON_DATACENTER, } from './ipv4.constant'; export default class AgoraIpV4OrderController { @@ -67,6 +70,9 @@ export default class AgoraIpV4OrderController { } $onInit() { + this.catalogByLocation = []; + this.isParkingIp = false; + this.parkingIpOffers = []; this.model = { params: {}, selectedService: null, @@ -111,6 +117,11 @@ export default class AgoraIpV4OrderController { services: this.Ipv4AgoraOrder.getServices(), }) .then((results) => { + results.services.push({ + displayName: this.$translate.instant('ip_servicetype__PARK'), + serviceName: 'parking', + type: 'parking', + }); this.user = results.user; this.services = results.services.map((service) => ({ ...service, @@ -152,6 +163,10 @@ export default class AgoraIpV4OrderController { (config) => config.name === 'country', ).values; + const datacenterCodes = ipOffer.details.product.configurations.find( + (config) => config.name === 'datacenter', + )?.values; + return { productName: ipOffer.invoiceName, productShortName: ipOffer.invoiceName.replace(/^.*\]\s*/, ''), @@ -162,6 +177,7 @@ export default class AgoraIpV4OrderController { ).price, maximumQuantity, quantities: range(1, maximumQuantity + 1), + datacenterCodes, countries: countryCodes.map((countryCode) => ({ code: countryCode, description: this.$translate.instant( @@ -206,13 +222,15 @@ export default class AgoraIpV4OrderController { } request.then((region) => { - this.model.selectedServiceRegion = - this.model.selectedService?.type === - PRODUCT_TYPES.dedicatedServer.typeName - ? this.$translate.instant(`ip_region_${region}`) - : this.ovhManagerRegionService.getTranslatedMicroRegionLocation( - region.toUpperCase(), - ); + if (region) { + this.model.selectedServiceRegion = + this.model.selectedService?.type === + PRODUCT_TYPES.dedicatedServer.typeName + ? this.$translate.instant(`ip_region_${region}`) + : this.ovhManagerRegionService.getTranslatedMicroRegionLocation( + region.toUpperCase(), + ); + } this.loadServiceRegion = false; }); } @@ -237,6 +255,23 @@ export default class AgoraIpV4OrderController { return 'USA'; } + static getRegionFromDatacenter(datacenter) { + return IP_LOCATION_GROUPS_BASED_ON_DATACENTER.find((group) => + group.datacenter.includes(datacenter), + )?.labels; + } + + static getCountriesFromDatacenter(selectedServiceDatacenter, ipOffers) { + const ipOffer = ipOffers.find((offer) => { + return offer.details.product.configurations + .find((config) => config.name === 'datacenter') + ?.values?.includes(selectedServiceDatacenter); + }); + return ipOffer.details.product.configurations.find( + (config) => config.name === 'country', + )?.values; + } + loadPrivateCloudIpOffers(serviceName) { const countries = this.orderableIpCountries.map((code) => { return { @@ -272,6 +307,40 @@ export default class AgoraIpV4OrderController { this.trackStep(3); } + onIpServiceSelection() { + this.isParkingIp = + this.model?.selectedService?.type === PRODUCT_TYPES.parking.typeName; + if (this.isParkingIp) { + this.loading.region = true; + this.parkingIpOffers = this.ipCatalog.filter((plan) => + /^ip-v4|^ip-failover/.test(plan.planCode), + ); + const DATACENTERS = this.parkingIpOffers + .map((ipOffer) => { + return ipOffer.details.product.configurations.find( + (config) => config.name === 'datacenter', + )?.values; + }) + .flat(); + const uniqueDatacenters = [...new Set(DATACENTERS)]; + this.catalogByLocation = uniqueDatacenters.map((datacenter) => { + const flag = + datacenter === 'ERI' ? 'gb' : DATACENTER_TO_COUNTRY[datacenter]; + return { + datacenter, + regionName: DATACENTER_TO_REGION[datacenter], + location: this.$translate.instant( + `ip_agora_ipv6_location_${DATACENTER_TO_REGION[datacenter]}`, + ), + icon: `oui-flag oui-flag_${flag}`, + }; + }); + this.loading.region = false; + return null; + } + return this.manageLoadIpOffers(); + } + manageLoadIpOffers() { this.trackStep(2); this.loading.ipOffers = true; @@ -323,23 +392,60 @@ export default class AgoraIpV4OrderController { loadIpOffers() { this.model.params = {}; let ipOffersPromise; + let failoverIpOfferDetails; + let blockIpOfferDetails; this.isPrivateCloudOffer = - get(this.model, 'selectedService.type') === - PRODUCT_TYPES.privateCloud.typeName; + this.model?.selectedService?.type === PRODUCT_TYPES.privateCloud.typeName; if (this.isPrivateCloudOffer) { ipOffersPromise = this.loadPrivateCloudIpOffers( get(this.model, 'selectedService.serviceName'), ); + } else if (this.isParkingIp) { + // Country for Single IP selection in parking + const country = [ + DATACENTER_TO_COUNTRY[this.model.selectedRegion.datacenter], + ]; + // Multiple countries are available for block IP selection in parking and vrack + const countries = AgoraIpV4OrderController.getCountriesFromDatacenter( + this.model.selectedRegion.datacenter, + this.parkingIpOffers, + ).map((value) => value.toLowerCase()); + const ipOfferDetails = this.parkingIpOffers.map( + this.createOfferDto.bind(this), + ); + const ipOffersByDatacenter = AgoraIpV4OrderController.getRegionFromDatacenter( + this.model.selectedRegion.datacenter, + ); + blockIpOfferDetails = this.filterOffer( + ipOfferDetails, + 'productShortName', + 'block', + ); + failoverIpOfferDetails = this.filterOffer( + ipOfferDetails, + 'planCode', + 'failover', + ); + this.failoverIpOffers = this.getOfferDetails( + failoverIpOfferDetails, + ipOffersByDatacenter, + country, + ); + this.blockIpOffers = this.getOfferDetails( + blockIpOfferDetails, + ipOffersByDatacenter, + countries, + ).sort((a, b) => a.price.value - b.price.value); } else { ipOffersPromise = this.Ipv4AgoraOrder.getIpOffers( this.user.ovhSubsidiary, this.catalogName, ).then((ipOffers) => { - const ipOfferDetails = ipOffers.map(this.createOfferDto.bind(this)); - let failoverIpOfferDetails; - let blockIpOfferDetails; + const ipOfferDetails = ipOffers + .filter((plan) => /^ip-v4|^ip-failover/.test(plan.planCode)) + .map(this.createOfferDto.bind(this)); if (this.model.selectedService.type === PRODUCT_TYPES.vps.typeName) { failoverIpOfferDetails = ipOfferDetails .filter(({ planCode }) => planCode.includes('failover')) @@ -445,6 +551,13 @@ export default class AgoraIpV4OrderController { this.model.params.selectedCountry = head( get(this.model, 'params.selectedOffer.countries'), ); + } else if (this.isParkingIp) { + const code = DATACENTER_TO_COUNTRY[this.model.selectedRegion.datacenter]; + this.model.params.selectedCountry = { + code: code.toUpperCase(), + description: this.$translate.instant(`country_${code.toUpperCase()}`), + icon: `oui-flag oui-flag_${code}`, + }; } } @@ -497,6 +610,17 @@ export default class AgoraIpV4OrderController { serviceName: get(this.model, 'selectedService.serviceName'), ...commonProductProps, }); + } else if (this.isParkingIp) { + const { datacenter } = this.model.selectedRegion; + productToOrder = this.IpAgoraOrder.constructor.createProductToOrder({ + organisation: get( + this.model.params, + 'selectedOrganisation.organisationId', + ), + ...commonProductProps, + country: params.selectedCountry?.code, + datacenter, + }); } else { productToOrder = this.IpAgoraOrder.constructor.createProductToOrder({ organisation: get( @@ -558,7 +682,8 @@ export default class AgoraIpV4OrderController { return ( this.model.selectedService?.type === PRODUCT_TYPES.vps.typeName || this.model.selectedService?.type === - PRODUCT_TYPES.dedicatedServer.typeName + PRODUCT_TYPES.dedicatedServer.typeName || + this.model.selectedService?.type === PRODUCT_TYPES.parking.typeName ); } @@ -567,7 +692,8 @@ export default class AgoraIpV4OrderController { this.model.selectedService?.type === PRODUCT_TYPES.privateCloud.typeName || this.model.selectedService?.type === - PRODUCT_TYPES.dedicatedServer.typeName + PRODUCT_TYPES.dedicatedServer.typeName || + this.model.selectedService?.type === PRODUCT_TYPES.parking.typeName ); } diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.html b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.html index 576f6572f372..3c6abbddede8 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.html +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.html @@ -3,7 +3,9 @@ data-current-index="$ctrl.currentStep" data-on-finish="$ctrl.redirectToPaymentPage()" > +
@@ -55,17 +57,48 @@ data-translate="ip_order_noservices" >
 + + + +
+ +
+
+ + +
+ + +
@@ -188,71 +221,110 @@

+ + -
-
-

-
-
- + +
+
+

+
+
+ + - -
+
+
+
+ +
+
+ +
-
-

- -

- +
+ + + + +
+

+ +

+ + + - - - + - - -
+ + +
-
+ \ No newline at end of file diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_de_DE.json b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_de_DE.json index 2f3be9011165..21e9ced3e1bc 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_de_DE.json +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_de_DE.json @@ -83,5 +83,9 @@ "ip_region_ap-south-mum": "Asien-Pazifik (Indien – Mumbai)", "ip_region_labeu-west-1-preprod": "LABEU (Frankreich – Croix) (PREPROD)", "ip_region_labeu-west-1-dev-1": "LABEU (Frankreich – Croix) (DEV-1)", - "ip_region_labeu-west-1-dev-2": "LABEU (Frankreich – Croix) (DEV-2)" + "ip_region_labeu-west-1-dev-2": "LABEU (Frankreich – Croix) (DEV-2)", + "ip_agora_table_header_region": "Wählen Sie eine Region für Ihre neue Additional IP aus.", + "ip_agora_ipv4_localisation_title": "Geolokalisierung der IP-Adresse", + "ip_agora_ipv4_localisation_description": "Um die Geolokalisierung Ihrer IP-Adresse zu ändern, wählen Sie bitte ein Land aus der Drop-down-Liste aus.", + "ip_agora_table_next_text": "Weiter" } diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_en_GB.json b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_en_GB.json index a16f5edf5d66..b5614ba4125b 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_en_GB.json +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_en_GB.json @@ -83,5 +83,9 @@ "ip_region_ap-south-mum": "Asia Pacific (India – Mumbai)", "ip_region_labeu-west-1-preprod": "LABEU (France – Croix) (PREPROD)", "ip_region_labeu-west-1-dev-1": "LABEU (France – Croix) (DEV-1)", - "ip_region_labeu-west-1-dev-2": "LABEU (France – Croix) (DEV-2)" + "ip_region_labeu-west-1-dev-2": "LABEU (France – Croix) (DEV-2)", + "ip_agora_table_header_region": "Select a region for your new Additional IP", + "ip_agora_ipv4_localisation_title": "IP address geolocation", + "ip_agora_ipv4_localisation_description": "To change the geolocation of your IP address, please select country in the drop-down list.", + "ip_agora_table_next_text": "Next" } diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_es_ES.json b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_es_ES.json index 0780bfe2ff25..b5a9bd7f23cc 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_es_ES.json +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_es_ES.json @@ -83,5 +83,9 @@ "ip_region_ap-south-mum": "Asia-Pacífico (India - Mumbai)", "ip_region_labeu-west-1-preprod": "LABEU (Francia - Croix) (PREPROD)", "ip_region_labeu-west-1-dev-1": "LABEU (Francia - Croix) (DEV-1)", - "ip_region_labeu-west-1-dev-2": "LABEU (Francia - Croix) (DEV-2)" + "ip_region_labeu-west-1-dev-2": "LABEU (Francia - Croix) (DEV-2)", + "ip_agora_table_header_region": "Seleccione una región para su nueva Additional IP", + "ip_agora_ipv4_localisation_title": "Geolocalización de la dirección IP", + "ip_agora_ipv4_localisation_description": "Para modificar la geolocalización de su dirección IP, seleccione un país de la lista desplegable.", + "ip_agora_table_next_text": "Siguiente" } diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_fr_CA.json b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_fr_CA.json index a9c1ae2912dc..339e77b002d4 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_fr_CA.json +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_fr_CA.json @@ -1,4 +1,5 @@ { + "ip_agora_table_header_region": "Sélectionnez une région pour votre nouvelle Additional IP", "ip_agora_table_header_offer": "Choisissez votre offre", "ip_agora_table_header_quantity": "Quantité", "ip_agora_table_header_country": "Localisée(s) en", @@ -6,6 +7,8 @@ "ip_agora_select_quantity_title": "Choisissez votre quantité", "ip_agora_ip_localisation_title": "Localisation de l'adresse IP", "ip_agora_ip_localisation_description": "Veuillez choisir l'un des emplacements disponibles pour votre nouveau bloc d'adresses {{ ipType }} supplémentaire.", + "ip_agora_ipv4_localisation_title": "Géolocalisation de l'adresse IP", + "ip_agora_ipv4_localisation_description": "Pour modifier la géolocalisation de votre adresse IP, merci de choisir un pays dans la liste déroulante.", "ipv4_select_placeholder": "Selectionner une taille", "license_dashboard_title": "Commander une IP", "ipv4Block_description": "Bloc d'adresse IPv4. Les tailles de bloc disponibles varient en fonction du service associé.", @@ -15,6 +18,7 @@ "ipv4Block_organization_info_banner": "Le nom de l'organisation associée à votre bloc d'adresse IP ainsi que les informations de contact correspondantes figureront dans la base de données publique Whois", "ip_agora_table_submit_text": "Continuer ma commande", "ip_agora_table_cancel_text": "Retour", + "ip_agora_table_next_text": "Suivant", "ip_agora_title": "Sélectionner la version de l'adresse IP", "ip_agora_description": "Pour un certain nombre de cas, vous aurez peut-être besoin d'une IPv4 standard, la plus utilisée, ou d'une nouvelle version du protocole - l'IPv6. Veuillez noter que la liste des produits compatibles peut varier.", "ip_agora_ipv4_description": "Standard Internet (à partir d'aujourd'hui). Protocole d'adressage le plus couramment utilisé sur Internet, donc le plus couramment pris en charge.", diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_fr_FR.json b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_fr_FR.json index a9c1ae2912dc..339e77b002d4 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_fr_FR.json +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_fr_FR.json @@ -1,4 +1,5 @@ { + "ip_agora_table_header_region": "Sélectionnez une région pour votre nouvelle Additional IP", "ip_agora_table_header_offer": "Choisissez votre offre", "ip_agora_table_header_quantity": "Quantité", "ip_agora_table_header_country": "Localisée(s) en", @@ -6,6 +7,8 @@ "ip_agora_select_quantity_title": "Choisissez votre quantité", "ip_agora_ip_localisation_title": "Localisation de l'adresse IP", "ip_agora_ip_localisation_description": "Veuillez choisir l'un des emplacements disponibles pour votre nouveau bloc d'adresses {{ ipType }} supplémentaire.", + "ip_agora_ipv4_localisation_title": "Géolocalisation de l'adresse IP", + "ip_agora_ipv4_localisation_description": "Pour modifier la géolocalisation de votre adresse IP, merci de choisir un pays dans la liste déroulante.", "ipv4_select_placeholder": "Selectionner une taille", "license_dashboard_title": "Commander une IP", "ipv4Block_description": "Bloc d'adresse IPv4. Les tailles de bloc disponibles varient en fonction du service associé.", @@ -15,6 +18,7 @@ "ipv4Block_organization_info_banner": "Le nom de l'organisation associée à votre bloc d'adresse IP ainsi que les informations de contact correspondantes figureront dans la base de données publique Whois", "ip_agora_table_submit_text": "Continuer ma commande", "ip_agora_table_cancel_text": "Retour", + "ip_agora_table_next_text": "Suivant", "ip_agora_title": "Sélectionner la version de l'adresse IP", "ip_agora_description": "Pour un certain nombre de cas, vous aurez peut-être besoin d'une IPv4 standard, la plus utilisée, ou d'une nouvelle version du protocole - l'IPv6. Veuillez noter que la liste des produits compatibles peut varier.", "ip_agora_ipv4_description": "Standard Internet (à partir d'aujourd'hui). Protocole d'adressage le plus couramment utilisé sur Internet, donc le plus couramment pris en charge.", diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_it_IT.json b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_it_IT.json index 56c241216097..dcb65ae775c5 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_it_IT.json +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_it_IT.json @@ -83,5 +83,9 @@ "ip_region_ap-south-mum": "Asia Pacifica (India - Mumbai)", "ip_region_labeu-west-1-preprod": "LABEU (Francia - Croix) (PREPROD)", "ip_region_labeu-west-1-dev-1": "LABEU (Francia - Croix) (DEV-1)", - "ip_region_labeu-west-1-dev-2": "LABEU (Francia - Croix) (DEV-2)" + "ip_region_labeu-west-1-dev-2": "LABEU (Francia - Croix) (DEV-2)", + "ip_agora_table_header_region": "Seleziona una Region per il tuo nuovo Additional IP", + "ip_agora_ipv4_localisation_title": "Geolocalizzazione dell'indirizzo IP", + "ip_agora_ipv4_localisation_description": "Per modificare la geolocalizzazione del tuo indirizzo IP, seleziona un Paese dal menu a tendina.", + "ip_agora_table_next_text": "Successivo" } diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_pl_PL.json b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_pl_PL.json index 9023bb84c1b4..ce0d4f601d51 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_pl_PL.json +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_pl_PL.json @@ -83,5 +83,9 @@ "ip_region_ap-south-mum": "Azja-Pacyfik (Indie-Mumbaj)", "ip_region_labeu-west-1-preprod": "LABEU (Francja - Croix) (PREPROD)", "ip_region_labeu-west-1-dev-1": "LABEU (Francja - Croix) (DEV-1)", - "ip_region_labeu-west-1-dev-2": "LABEU (Francja - Croix) (DEV-2)" + "ip_region_labeu-west-1-dev-2": "LABEU (Francja - Croix) (DEV-2)", + "ip_agora_table_header_region": "Wybierz region dla nowego Additional IP", + "ip_agora_ipv4_localisation_title": "Geolokalizacja adresu IP", + "ip_agora_ipv4_localisation_description": "Aby zmienić geolokalizację adresu IP, wybierz kraj z rozwijanej listy.", + "ip_agora_table_next_text": "Dalej" } diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_pt_PT.json b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_pt_PT.json index b504be745152..273dff68ca52 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_pt_PT.json +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/translations/Messages_pt_PT.json @@ -83,5 +83,9 @@ "ip_region_ap-south-mum": "Ásia-Pacífico (Índia - Mumbai)", "ip_region_labeu-west-1-preprod": "LABEU (França - Croix) (PREPROD)", "ip_region_labeu-west-1-dev-1": "LABEU (França - Croix) (DEV-1)", - "ip_region_labeu-west-1-dev-2": "LABEU (França - Croix) (DEV-2)" -} \ No newline at end of file + "ip_region_labeu-west-1-dev-2": "LABEU (França - Croix) (DEV-2)", + "ip_agora_table_header_region": "Selecione uma região para o seu novo Additional IP", + "ip_agora_ipv4_localisation_title": "Geolocalização do endereço IP", + "ip_agora_ipv4_localisation_description": "Para alterar a geolocalização do seu endereço IP, escolha um país na lista pendente.", + "ip_agora_table_next_text": "Seguinte" +} diff --git a/packages/manager/apps/dedicated/client/app/config/constants.config.js b/packages/manager/apps/dedicated/client/app/config/constants.config.js index 66c87c67f06c..00c6bd37effb 100644 --- a/packages/manager/apps/dedicated/client/app/config/constants.config.js +++ b/packages/manager/apps/dedicated/client/app/config/constants.config.js @@ -1081,6 +1081,12 @@ const constants = { }, pcc: { fr_FR: [ + { + title: 'core_pcc_top_guide_13_title', + atInternetClickTag: 'TopGuide-PrivateCloud-13', + url: + 'https://help.ovhcloud.com/csm/fr-vmware-authorise-ip-addresses-vcenter?id=kb_article_view&sysparm_article=KB0045333', + }, { title: 'core_pcc_top_guide_12_title', atInternetClickTag: 'TopGuide-PrivateCloud-12', @@ -1139,6 +1145,12 @@ const constants = { }, ], de_DE: [ + { + title: 'core_pcc_top_guide_13_title', + atInternetClickTag: 'TopGuide-PrivateCloud-13', + url: + 'https://help.ovhcloud.com/csm/de-vmware-authorise-ip-addresses-vcenter?id=kb_article_view&sysparm_article=KB0045323', + }, { title: 'core_pcc_top_guide_12_title', atInternetClickTag: 'TopGuide-PrivateCloud-12', @@ -1192,6 +1204,12 @@ const constants = { }, ], en_GB: [ + { + title: 'core_pcc_top_guide_13_title', + atInternetClickTag: 'TopGuide-PrivateCloud-13', + url: + 'https://help.ovhcloud.com/csm/en-gb-vmware-authorise-ip-addresses-vcenter?id=kb_article_view&sysparm_article=KB0045321', + }, { title: 'core_pcc_top_guide_12_title', atInternetClickTag: 'TopGuide-PrivateCloud-12', @@ -1751,6 +1769,12 @@ const constants = { }, pcc: { fr_FR: [ + { + title: 'core_pcc_top_guide_13_title', + atInternetClickTag: 'TopGuide-PrivateCloud-13', + url: + 'https://help.ovhcloud.com/csm/fr-vmware-authorise-ip-addresses-vcenter?id=kb_article_view&sysparm_article=KB0045333', + }, { title: 'core_pcc_top_guide_12_title', atInternetClickTag: 'TopGuide-PrivateCloud-12', @@ -1809,6 +1833,12 @@ const constants = { }, ], de_DE: [ + { + title: 'core_pcc_top_guide_13_title', + atInternetClickTag: 'TopGuide-PrivateCloud-13', + url: + 'https://help.ovhcloud.com/csm/de-vmware-authorise-ip-addresses-vcenter?id=kb_article_view&sysparm_article=KB0045323', + }, { title: 'core_pcc_top_guide_12_title', atInternetClickTag: 'TopGuide-PrivateCloud-12', @@ -1862,6 +1892,12 @@ const constants = { }, ], en_GB: [ + { + title: 'core_pcc_top_guide_13_title', + atInternetClickTag: 'TopGuide-PrivateCloud-13', + url: + 'https://help.ovhcloud.com/csm/en-gb-vmware-authorise-ip-addresses-vcenter?id=kb_article_view&sysparm_article=KB0045321', + }, { title: 'core_pcc_top_guide_12_title', atInternetClickTag: 'TopGuide-PrivateCloud-12', diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_de_DE.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_de_DE.json index e5f459133fc2..173432cb89f6 100644 --- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_de_DE.json +++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_de_DE.json @@ -770,5 +770,6 @@ "ip_table_header_region": "Region", "ip_byoip_delete_block_title": "Block löschen", "ip_byoip_delete_block_description": "Dieser IP-Block ist Teil eines größeren BYOIP-Blocks. Wenn Sie Ihren BYOIP-Dienst kündigen möchten, öffnen Sie Meine Dienste und wählen Sie die Option zum Kündigen aus.", - "ip_table_manage_modify_ipv6block_reverse": "Reverse ändern" + "ip_table_manage_modify_ipv6block_reverse": "Reverse ändern", + "ip_filter_services_title_parking": "Parking" } diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_en_GB.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_en_GB.json index 3b2652f4c6df..1ce8c98680e6 100644 --- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_en_GB.json +++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_en_GB.json @@ -770,5 +770,6 @@ "ip_table_header_region": "Region", "ip_byoip_delete_block_title": "Delete block", "ip_byoip_delete_block_description": "This IP block is part of a larger BYOIP block. Please go to My Services and select “Cancel” if you would like to cancel your BYOIP service", - "ip_table_manage_modify_ipv6block_reverse": "Modify the reverse path" + "ip_table_manage_modify_ipv6block_reverse": "Modify the reverse path", + "ip_filter_services_title_parking": "Parking" } diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_es_ES.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_es_ES.json index 2befb6d2ea72..bc4262fc194a 100644 --- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_es_ES.json +++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_es_ES.json @@ -770,5 +770,6 @@ "ip_table_header_region": "Región", "ip_byoip_delete_block_title": "Eliminar el bloque", "ip_byoip_delete_block_description": "Este bloque de IP forma parte de un bloque BYOIP más grande. Por favor, acceda a Mis servicios para cancelar su servicio BYOIP.", - "ip_table_manage_modify_ipv6block_reverse": "Cambiar el registro inverso" + "ip_table_manage_modify_ipv6block_reverse": "Cambiar el registro inverso", + "ip_filter_services_title_parking": "Parking" } diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_CA.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_CA.json index c34f579de60e..15ad58ef5da1 100644 --- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_CA.json +++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_CA.json @@ -111,6 +111,7 @@ "ip_filter_services_title_MAIL": "Serveurs de Mails", "ip_filter_services_title_CLOUD": "Public Cloud", "ip_filter_services_title_IP_LOAD_BALANCING": "OVHcloud Load Balancer", + "ip_filter_services_title_parking": "Parking", "ip_filter_services_CDN": "Uniquement les CDN", "ip_filter_services_DEDICATED": "Uniquement les Serveurs Dédiés", "ip_filter_services_HOSTED_SSL": "Uniquement les Hosted SSL", diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json index c34f579de60e..15ad58ef5da1 100644 --- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json +++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json @@ -111,6 +111,7 @@ "ip_filter_services_title_MAIL": "Serveurs de Mails", "ip_filter_services_title_CLOUD": "Public Cloud", "ip_filter_services_title_IP_LOAD_BALANCING": "OVHcloud Load Balancer", + "ip_filter_services_title_parking": "Parking", "ip_filter_services_CDN": "Uniquement les CDN", "ip_filter_services_DEDICATED": "Uniquement les Serveurs Dédiés", "ip_filter_services_HOSTED_SSL": "Uniquement les Hosted SSL", diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_it_IT.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_it_IT.json index c2dce066f94a..1a9a952650a3 100644 --- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_it_IT.json +++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_it_IT.json @@ -770,5 +770,6 @@ "ip_table_header_region": "Region", "ip_byoip_delete_block_title": "Eliminare il blocco", "ip_byoip_delete_block_description": "Questo blocco IP fa parte di un blocco BYOIP più grande. Accedi alla sezione I miei servizi e seleziona `Disattivare` per annullare il servizio BYOIP.", - "ip_table_manage_modify_ipv6block_reverse": "Modificare il reverse" + "ip_table_manage_modify_ipv6block_reverse": "Modificare il reverse", + "ip_filter_services_title_parking": "Parking" } diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pl_PL.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pl_PL.json index d4defa072dc6..075b664991ae 100644 --- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pl_PL.json +++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pl_PL.json @@ -770,5 +770,6 @@ "ip_table_header_region": "Region", "ip_byoip_delete_block_title": "Usuń blok", "ip_byoip_delete_block_description": "Ten blok IP jest częścią większego bloku BYOIP. Przejdź do sekcji Moje usługi i wybierz opcję „Rezygnacja”, jeśli chcesz anulować usługę BYOIP.", - "ip_table_manage_modify_ipv6block_reverse": "Zmień rewers" + "ip_table_manage_modify_ipv6block_reverse": "Zmień rewers", + "ip_filter_services_title_parking": "Parking" } diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pt_PT.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pt_PT.json index 348dcb5fbca7..ee1f95b3da7f 100644 --- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pt_PT.json +++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_pt_PT.json @@ -770,5 +770,6 @@ "ip_table_header_region": "Região", "ip_byoip_delete_block_title": "Eliminar o bloco", "ip_byoip_delete_block_description": "Este bloco de IP faz parte de um maior bloco BYOIP. Aceda a Os meus serviços e escolha a opção \"rescindir\" se pretender rescindir o seu serviço BYOIP", - "ip_table_manage_modify_ipv6block_reverse": "Modificar a reverse" + "ip_table_manage_modify_ipv6block_reverse": "Modificar a reverse", + "ip_filter_services_title_parking": "Parking" } diff --git a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_de_DE.json b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_de_DE.json index baf0f171a9ab..e9bcf1add15f 100644 --- a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_de_DE.json +++ b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_de_DE.json @@ -1,6 +1,6 @@ { "key_management_service_service_keys": "Verschlüsselungsschlüssel", - "key_management_service_service-keys_headline": "Erstellen, importieren und verwalten Sie Ihre CMK-Verschlüsselungsschlüssel (Customer Managed Keys).", + "key_management_service_service-keys_headline": "Erstellen und verwalten Sie Ihre CMK-Verschlüsselungsschlüssel (Customer Managed Keys).", "key_management_service_service-keys_column_name": "Name", "key_management_service_service-keys_column_id": "ID", "key_management_service_service-keys_column_type": "Typ", diff --git a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_en_GB.json b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_en_GB.json index b5d1811b85d6..f81884cff988 100644 --- a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_en_GB.json +++ b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_en_GB.json @@ -1,6 +1,6 @@ { "key_management_service_service_keys": "Encryption keys", - "key_management_service_service-keys_headline": "Create, import and manage your Customer Managed Keys (CMK) encryption keys.", + "key_management_service_service-keys_headline": "Create and manage your Customer Managed Keys (CMK).", "key_management_service_service-keys_column_name": "Name", "key_management_service_service-keys_column_id": "ID", "key_management_service_service-keys_column_type": "Type", diff --git a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_es_ES.json b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_es_ES.json index bb3fe0a6d2e3..492331e1209e 100644 --- a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_es_ES.json +++ b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_es_ES.json @@ -1,6 +1,6 @@ { "key_management_service_service_keys": "Claves de cifrado", - "key_management_service_service-keys_headline": "Cree, importe y gestione sus claves de cifrado CMK (Customer Managed Keys).", + "key_management_service_service-keys_headline": "Cree y gestione sus claves de cifrado CMK (Customer Managed Keys).", "key_management_service_service-keys_column_name": "Apellido", "key_management_service_service-keys_column_id": "ID", "key_management_service_service-keys_column_type": "Tipo", diff --git a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_fr_CA.json b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_fr_CA.json index 4491bb08c687..92168357b4be 100644 --- a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_fr_CA.json +++ b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_fr_CA.json @@ -1,7 +1,7 @@ { "key_management_service_service_keys": "Clés de chiffrement", "key_management_service_service_keys_back_link": "Retour à la liste des clés", - "key_management_service_service-keys_headline": "Créez, importez et gérez vos clés de chiffrements CMK (Customer Managed Keys).", + "key_management_service_service-keys_headline": "Créez et gérez vos clés de chiffrements CMK (Customer Managed Keys).", "key_management_service_service-keys_column_name": "Nom", "key_management_service_service-keys_column_id": "ID", "key_management_service_service-keys_column_type": "Type", diff --git a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_fr_FR.json b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_fr_FR.json index 4491bb08c687..92168357b4be 100644 --- a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_fr_FR.json +++ b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_fr_FR.json @@ -1,7 +1,7 @@ { "key_management_service_service_keys": "Clés de chiffrement", "key_management_service_service_keys_back_link": "Retour à la liste des clés", - "key_management_service_service-keys_headline": "Créez, importez et gérez vos clés de chiffrements CMK (Customer Managed Keys).", + "key_management_service_service-keys_headline": "Créez et gérez vos clés de chiffrements CMK (Customer Managed Keys).", "key_management_service_service-keys_column_name": "Nom", "key_management_service_service-keys_column_id": "ID", "key_management_service_service-keys_column_type": "Type", diff --git a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_it_IT.json b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_it_IT.json index 59a69bfc14f8..c758ae332d5a 100644 --- a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_it_IT.json +++ b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_it_IT.json @@ -1,6 +1,6 @@ { "key_management_service_service_keys": "Chiavi di crittografia", - "key_management_service_service-keys_headline": "Crea, importa e gestisci le tue chiavi di cifratura CMK (Customer Managed Keys).", + "key_management_service_service-keys_headline": "Crea e gestisci le tue chiavi di crittografia CMK (Customer Managed Keys).", "key_management_service_service-keys_column_name": "Cognome", "key_management_service_service-keys_column_id": "ID", "key_management_service_service-keys_column_type": "Tipo", diff --git a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_pl_PL.json b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_pl_PL.json index 99fa5b768d51..43c48df15ac1 100644 --- a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_pl_PL.json +++ b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_pl_PL.json @@ -1,6 +1,6 @@ { "key_management_service_service_keys": "Klucze szyfrowania", - "key_management_service_service-keys_headline": "Twórz, importuj i zarządzaj kluczami szyfrującymi CMK (Customer Managed Keys).", + "key_management_service_service-keys_headline": "Twórz i zarządzaj kluczami do szyfrowania CMK (Customer Managed Keys).", "key_management_service_service-keys_column_name": "Nazwisko", "key_management_service_service-keys_column_id": "ID", "key_management_service_service-keys_column_type": "Typ", diff --git a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_pt_PT.json b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_pt_PT.json index 5da3e9c68398..6f8b99696fb9 100644 --- a/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_pt_PT.json +++ b/packages/manager/apps/key-management-service/public/translations/key-management-service/serviceKeys/Messages_pt_PT.json @@ -1,6 +1,6 @@ { "key_management_service_service_keys": "Chaves de encriptação", - "key_management_service_service-keys_headline": "Crie, importe e faça a gestão das suas chaves de encriptação CMK (Customer Managed Keys).", + "key_management_service_service-keys_headline": "Crie e faça a gestão das suas chaves de encriptação CMK (Customer Managed Keys).", "key_management_service_service-keys_column_name": "Nome", "key_management_service_service-keys_column_id": "ID", "key_management_service_service-keys_column_type": "Tipo", diff --git a/packages/manager/modules/bm-server-components/src/netboot/controller.js b/packages/manager/modules/bm-server-components/src/netboot/controller.js index 654f35b6d199..c0257e5d67e0 100644 --- a/packages/manager/modules/bm-server-components/src/netboot/controller.js +++ b/packages/manager/modules/bm-server-components/src/netboot/controller.js @@ -37,6 +37,8 @@ export default class BmServerComponentsNetbootCtrl { this.SSHKEY = 'sshkey'; this.PASSWORD = 'password'; + this.NETBOOT_PRIORITY_ORDER = [this.RESCUE, this.HARDDISK, this.NETWORK]; + this.DEFAULT_RESCUE = 'rescue-customer'; this.loading = { @@ -220,7 +222,27 @@ export default class BmServerComponentsNetbootCtrl { this.netbootService .getNetboot(this.serviceName) .then((netboots) => { - this.netboots = netboots; + this.netboots = Object.keys(netboots) + .sort((a, b) => { + const indexA = this.NETBOOT_PRIORITY_ORDER.indexOf(a); + const indexB = this.NETBOOT_PRIORITY_ORDER.indexOf(b); + + if (indexA !== -1 && indexB === -1) { + return -1; + } + if (indexA === -1 && indexB !== -1) { + return 1; + } + if (indexA !== -1 && indexB !== -1) { + return indexA - indexB; + } + return a.localeCompare(b); + }) + .reduce((obj, key) => { + const objTmp = { ...obj }; + objTmp[key] = netboots[key]; + return objTmp; + }, {}); if (this.netboots.ipxeCustomerScript) { delete this.netboots.ipxeCustomerScript; } diff --git a/packages/manager/modules/iplb/src/server/iplb-server-status.service.js b/packages/manager/modules/iplb/src/server/iplb-server-status.service.js index ea7c5a4ff447..e3b3fd644e6b 100644 --- a/packages/manager/modules/iplb/src/server/iplb-server-status.service.js +++ b/packages/manager/modules/iplb/src/server/iplb-server-status.service.js @@ -28,7 +28,7 @@ export default class IpblServerStatusService { } if (this.constructor.hasNoInfo(server)) { - return 'help'; + return 'N/A'; } return 'success'; diff --git a/packages/manager/modules/iplb/src/serverFarm/iplb-server-farm.html b/packages/manager/modules/iplb/src/serverFarm/iplb-server-farm.html index 154f3dd59f4d..c5292987ebac 100644 --- a/packages/manager/modules/iplb/src/serverFarm/iplb-server-farm.html +++ b/packages/manager/modules/iplb/src/serverFarm/iplb-server-farm.html @@ -66,7 +66,7 @@

data-server="$row" tabindex="0" role="button" - data-ng-click="ctrl.seeServerStatus($row)" + data-ng-click="$row.serverState.length !== 0 && ctrl.seeServerStatus($row)" >