Skip to content

Commit

Permalink
Merge pull request #9826 from ovh/sync/master-develop
Browse files Browse the repository at this point in the history
Sync/master develop
  • Loading branch information
anooparveti authored Aug 9, 2023
2 parents c8fd005 + 0a7b1fe commit fa09d08
Show file tree
Hide file tree
Showing 17 changed files with 133 additions and 92 deletions.
2 changes: 1 addition & 1 deletion .sonarcloud.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sonar.projectName=manager
sonar.sources=.
sonar.sourceEncoding=UTF-8
sonar.ws.timeout=60
sonar.projectVersion=mendelevium-mouse-2
sonar.projectVersion=cobalt-donkey

sonar.exclusions=node_modules/**, **/node_modules/**, **/dist/**, **/semantic/**, **/coverage/**
sonar.coverage.exclusions=**/*.spec.js
Expand Down
11 changes: 11 additions & 0 deletions packages/manager/apps/dedicated/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [18.7.1](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-08)


### Bug Fixes

* **dedicated.server:** order private bandwidth upgrade ([#9815](https://github.com/ovh/manager/issues/9815)) ([e943086](https://github.com/ovh/manager/commit/e94308602f029c21ecb339ea7148e7b804f181ea))





# [18.7.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-08)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ export default {
template,
bindings: {
alertError: '<',
atTrack: '<',
goBack: '<',
hasDefaultPaymentMethod: '<',
serverName: '<',
specifications: '<',
trackClick: '<',
trackingPrefix: '<',
user: '<',
handleError: '<',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ export default /* @ngInject */ ($stateProvider) => {
),
)?.serviceId,
),
trackingPrefix: () =>
trackClick: /* @ngInject */ (atInternet) => (name) =>
atInternet.trackClick({
name,
type: 'action',
chapter1: 'dedicated',
}),
trackingPrefix: /* @ngInject */ () =>
'dedicated::server::interfaces::bandwidth-private-order::',
},
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
service-name="{{ $ctrl.server.name }}"
on-error="$ctrl.handleError(error)"
on-success="$ctrl.handleSuccess(message)"
at-track="$ctrl.atTrack"
track-click="$ctrl.trackClick"
go-back="$ctrl.goBack"
has-default-payment-method="$ctrl.hasDefaultPaymentMethod"
server-name="$ctrl.serverName"
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/apps/dedicated/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ovh-ux/manager-dedicated",
"version": "18.7.0",
"version": "18.7.1",
"private": true,
"description": "OVHcloud Dedicated control panel.",
"repository": {
Expand Down
11 changes: 11 additions & 0 deletions packages/manager/apps/web/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [17.2.0](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-08)


### Features

* **web.hosting:** hide contracts list when empty ([#9760](https://github.com/ovh/manager/issues/9760)) ([dd42639](https://github.com/ovh/manager/commit/dd42639a0134b8f77fe7b50a9d53bf4d2e2b06bf))





## [17.1.2](https://github.com/ovh/manager/compare/@ovh-ux/[email protected]...@ovh-ux/[email protected]) (2023-08-08)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,6 @@
"hosting_dashboard_service_offer_PERFORMANCE_4": "Performance 4",
"hosting_dashboard_service_offer_KIMSUFI_2015": "Kimsufi 2015",
"hosting_dashboard_service_offer_KS": "Kimsufi 2015",
"hosting_dashboard_service_offer_HOSTING_FREE_100_M": "Kostenloses Hosting 100M",
"hosting_dashboard_service_offer_HOSTING_STARTER_OVH": "Starter",
"hosting_dashboard_service_offer_HOSTING_STARTER": "Starter",
"hosting_dashboard_service_offer_HOSTING_PERSO": "Basic",
"hosting_dashboard_service_offer_HOSTING_PRO": "Pro",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_1": "Performance 1",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_2": "Performance 2",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_3": "Performance 3",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_4": "Performance 4",
"hosting_dashboard_service_offer_downgrade_KIMSUFI_2015": "Wenn Sie auf ein Kimsufi 2015 Angebot wechseln, ist der Support nicht mehr inklusive. Sie müssen dann das Ticket-System verwenden, um den Kundendienst zu kontaktieren.",
"hosting_dashboard_service_offer_downgrade_KIMSUFI_2015_agree": "Ich bestätige, dass ich die Bedingungen des Kimsufi 2015 Angebots zur Kenntnis genommen habe und bestätige meine Migrationsanfrage",
"hosting_dashboard_service_offer_KIMSUFI_2015_support": "Kimsufi Webhosting: Der Support erfolgt ausschließlich über das Ticket-System (Menüpunkt \"Assistance\")",
Expand Down Expand Up @@ -173,7 +164,6 @@
"hosting_dashboard_service_renew": "Verlängern",
"hosting_dashboard_service_change_offer": "Angebot wechseln",
"hosting_dashboard_service_change_offer_explanation": "Mit dem Angebot, das Sie derzeit nutzen, können keine Datenbanken erstellt werden. Um Datenbanken zu erstellen, müssen Sie zu einem kostenpflichtigen Hosting wechseln. Das geht schnell und ohne Unterbrechung.",
"hosting_dashboard_service_change_offer_explanation_only_one": "Mit Ihrem aktuellen Angebot verfügen Sie über eine einzige Datenbank. Wählen Sie ein höheres Angebot, um zusätzliche Datenbanken nutzen zu können.",
"hosting_dashboard_service_change_cdn": "CDN wechseln",
"hosting_dashboard_service_change_cdn_version": "Zu einem anderen Angebot wechseln",
"hosting_dashboard_service_order_ssl": "SSL-Zertifikat bestellen",
Expand Down Expand Up @@ -520,8 +510,6 @@
"hosting_tab_DOMAINS_configuration_add_loading_error_configuration": "Beim Laden der Informationen ist ein Fehler aufgetreten (Ihre Konfiguration befindet sich in einem fehlerhaften Status).",
"hosting_tab_DOMAINS_configuration_add_step1_title": "Sie sind im Begriff, Ihrem Shared Hosting <strong class=\"font-italic\">{{t0}}</strong> eine Domain hinzuzufügen.",
"hosting_tab_DOMAINS_configuration_add_step1_no_db_left": "Sie können Ihrem Webhosting keine weiteren Domains zuweisen",
"hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "Mit Ihrem aktuellen Angebot können Sie nur eine Website erstellen. Wählen Sie ein höheres Angebot, um eine weitere Website einrichten zu können.",
"hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Angebot wechseln",
"hosting_tab_DOMAINS_configuration_add_step1_ovh_search_placeholder": "Domain suchen",
"hosting_tab_DOMAINS_configuration_add_step1_ovh_search_no_result_found": "Keine Ergebnisse",
"hosting_tab_DOMAINS_configuration_add_step1_ovh": "Eine bei OVH registrierte Domain hinzufügen",
Expand Down Expand Up @@ -1063,7 +1051,6 @@
"hosting_order_upgrade_success": "Die Bestellung mit der Nummer <a href='{{t0}}' target='_blank'>{{t1}}</a> wurde erfasst.",
"hosting_order_upgrade_error": "Bei der Änderung Ihres Webhosting Angebots ist ein Fehler aufgetreten.",
"hosting_order_upgrade_modal_header": "Angebot ändern",
"hosting_order_upgrade_modal_header_description": "Ihr Projekt entwickelt sich weiter? Ob Blog, professionelle Website, E-Commerce-Plattform oder Webanwendung: Wählen Sie das Angebot, das Ihren neuen Anforderungen am besten entspricht.",
"hosting_order_upgrade_step_header_offer": "Angebot",
"hosting_order_upgrade_step_header_duration": "Dauer",
"hosting_order_upgrade_step_header_start_time": "Zeitpunkt des Updates",
Expand Down Expand Up @@ -1358,5 +1345,19 @@
"hosting_dashboard_service_common_inactive": "Inaktiv",
"hosting_dashboard_email_offer_get_error": "Es ist unmöglich, die E-Mail-Adresse wiederherzustellen.",
"hosting_dashboard_stats_status": "Beta",
"hosting_dashboard_tabs_dropdown": "Mehr"
"hosting_dashboard_tabs_dropdown": "Mehr",
"hosting_dashboard_service_offer_HOSTING_FREE_100_M": "Kostenloses Hosting 100M",
"hosting_dashboard_service_offer_HOSTING_STARTER_OVH": "Starter",
"hosting_dashboard_service_offer_HOSTING_STARTER": "Starter",
"hosting_dashboard_service_offer_HOSTING_PERSO": "Basic",
"hosting_dashboard_service_offer_HOSTING_PRO": "Pro",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_1": "Performance 1",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_2": "Performance 2",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_3": "Performance 3",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_4": "Performance 4",
"hosting_dashboard_service_change_offer_explanation_only_one": "Mit Ihrem aktuellen Angebot verfügen Sie über eine einzige Datenbank. Wählen Sie ein höheres Angebot, um zusätzliche Datenbanken nutzen zu können.",
"hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "Mit Ihrem aktuellen Angebot können Sie nur eine Website erstellen. Wählen Sie ein höheres Angebot, um eine weitere Website einrichten zu können.",
"hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Angebot wechseln",
"hosting_order_upgrade_modal_header_description": "Ihr Projekt entwickelt sich weiter? Ob Blog, professionelle Website, E-Commerce-Plattform oder Webanwendung: Wählen Sie das Angebot, das Ihren neuen Anforderungen am besten entspricht.",
"hosting_order_upgrade_no_contract": "Keine neuen Verträge zur Validierung vorhanden"
}
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,6 @@
"hosting_dashboard_service_offer_PERFORMANCE_4": "Performance 4",
"hosting_dashboard_service_offer_KIMSUFI_2015": "Kimsufi 2015",
"hosting_dashboard_service_offer_KS": "Kimsufi 2015",
"hosting_dashboard_service_offer_HOSTING_FREE_100_M": "100 MB free hosting",
"hosting_dashboard_service_offer_HOSTING_STARTER_OVH": "Starter",
"hosting_dashboard_service_offer_HOSTING_STARTER": "Starter",
"hosting_dashboard_service_offer_HOSTING_PERSO": "Personal",
"hosting_dashboard_service_offer_HOSTING_PRO": "Pro",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_1": "Performance 1",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_2": "Performance 2",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_3": "Performance 3",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_4": "Performance 4",
"hosting_dashboard_service_offer_downgrade_KIMSUFI_2015": "If you would like to migrate to a Kimsufi 2015 solution, please note that phone-based support is no longer included. You must use our ticketing system to contact our support team.",
"hosting_dashboard_service_offer_downgrade_KIMSUFI_2015_agree": "I have read and understood the Kimsufi 2015 terms, and confirm that I wish to migrate",
"hosting_dashboard_service_offer_KIMSUFI_2015_support": "Kimsufi web hosting: support is only offered via the ticketing system (Assistance menu)",
Expand Down Expand Up @@ -173,7 +164,6 @@
"hosting_dashboard_service_renew": "Renew",
"hosting_dashboard_service_change_offer": "Change plan",
"hosting_dashboard_service_change_offer_explanation": "You current solution does not enable database creation. To create databases, you will need to upgrade to a paid hosting plan. The upgrade process is quick, and does not result in any downtime.",
"hosting_dashboard_service_change_offer_explanation_only_one": "You only have one database with your current solution. To get additional databases, upgrade to one of our higher plans.",
"hosting_dashboard_service_change_cdn": "Change CDN",
"hosting_dashboard_service_change_cdn_version": "Change plan",
"hosting_dashboard_service_order_ssl": "Order an SSL certificate",
Expand Down Expand Up @@ -520,8 +510,6 @@
"hosting_tab_DOMAINS_configuration_add_loading_error_configuration": "An error has occurred loading information (you have a configuration error).",
"hosting_tab_DOMAINS_configuration_add_step1_title": "You are about to add a domain to your <strong class=\"font-italic\">{{t0}}</strong> web hosting plan",
"hosting_tab_DOMAINS_configuration_add_step1_no_db_left": "You cannot add more domains to your web hosting plan",
"hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "With your current plan, you can install only one website. To get an additional website, upgrade to one of our higher plans.",
"hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Change plan",
"hosting_tab_DOMAINS_configuration_add_step1_ovh_search_placeholder": "Search for a domain",
"hosting_tab_DOMAINS_configuration_add_step1_ovh_search_no_result_found": "No result",
"hosting_tab_DOMAINS_configuration_add_step1_ovh": "Add a domain registered with OVHcloud",
Expand Down Expand Up @@ -1063,7 +1051,6 @@
"hosting_order_upgrade_success": "Order number <a href='{{t0}}' target='_blank'>{{t1}}</a> has been processed.",
"hosting_order_upgrade_error": "An error has occurred updating your hosting plan.",
"hosting_order_upgrade_modal_header": "Modify your solution",
"hosting_order_upgrade_modal_header_description": "Is your project growing? From blogs and business websites to online shops and web applications, you can choose the best plan for your new needs.",
"hosting_order_upgrade_step_header_offer": "Solution",
"hosting_order_upgrade_step_header_duration": "Duration",
"hosting_order_upgrade_step_header_start_time": "Update time",
Expand Down Expand Up @@ -1358,5 +1345,19 @@
"hosting_dashboard_service_common_inactive": "Disabled",
"hosting_dashboard_email_offer_get_error": "Unable to retrieve email address",
"hosting_dashboard_stats_status": "Beta",
"hosting_dashboard_tabs_dropdown": "More"
"hosting_dashboard_tabs_dropdown": "More",
"hosting_dashboard_service_offer_HOSTING_FREE_100_M": "100 MB free hosting",
"hosting_dashboard_service_offer_HOSTING_STARTER_OVH": "Starter",
"hosting_dashboard_service_offer_HOSTING_STARTER": "Starter",
"hosting_dashboard_service_offer_HOSTING_PERSO": "Personal",
"hosting_dashboard_service_offer_HOSTING_PRO": "Pro",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_1": "Performance 1",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_2": "Performance 2",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_3": "Performance 3",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_4": "Performance 4",
"hosting_dashboard_service_change_offer_explanation_only_one": "You only have one database with your current solution. To get additional databases, upgrade to one of our higher plans.",
"hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "With your current plan, you can install only one website. To get an additional website, upgrade to one of our higher plans.",
"hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Change plan",
"hosting_order_upgrade_modal_header_description": "Is your project growing? From blogs and business websites to online shops and web applications, you can choose the best plan for your new needs.",
"hosting_order_upgrade_no_contract": "No new contracts to validate"
}
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,6 @@
"hosting_dashboard_service_offer_PERFORMANCE_4": "Performance 4",
"hosting_dashboard_service_offer_KIMSUFI_2015": "Kimsufi 2015",
"hosting_dashboard_service_offer_KS": "Kimsufi 2015",
"hosting_dashboard_service_offer_HOSTING_FREE_100_M": "Alojamiento gratuito de 100M",
"hosting_dashboard_service_offer_HOSTING_STARTER_OVH": "Starter",
"hosting_dashboard_service_offer_HOSTING_STARTER": "Starter",
"hosting_dashboard_service_offer_HOSTING_PERSO": "Personal",
"hosting_dashboard_service_offer_HOSTING_PRO": "Pro",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_1": "Performance 1",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_2": "Performance 2",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_3": "Performance 3",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_4": "Performance 4",
"hosting_dashboard_service_offer_downgrade_KIMSUFI_2015": "Recuerde que, al pasar a los planes Kimsufi 2015, no tendrá incluido el acceso al Soporte y deberá utilizar el sistema de tíquets para contactar con nuestro equipo.",
"hosting_dashboard_service_offer_downgrade_KIMSUFI_2015_agree": "He leído y acepto las condiciones del servicio Kimsufi 2015 y deseo confirmar mi solicitud de migración.",
"hosting_dashboard_service_offer_KIMSUFI_2015_support": "Web hosting Kimsufi: solo se ofrece soporte a través de un sistema de tíquets de incidencia (menú «Soporte»).",
Expand Down Expand Up @@ -173,7 +164,6 @@
"hosting_dashboard_service_renew": "Renovar",
"hosting_dashboard_service_change_offer": "Cambiar de plan",
"hosting_dashboard_service_change_offer_explanation": "Su solución no permite crear bases de datos. Para poder crear bases de datos, puede migrar a un plan de hosting de pago. ¡Rápido y sin interrupciones!",
"hosting_dashboard_service_change_offer_explanation_only_one": "Solo dispone de una base de datos con su solución actual. Para disfrutar de bases de datos adicionales, elija una de nuestras ofertas superiores.",
"hosting_dashboard_service_change_cdn": "Cambiar de CDN",
"hosting_dashboard_service_change_cdn_version": "Cambiar de plan",
"hosting_dashboard_service_order_ssl": "Contratar un certificado SSL",
Expand Down Expand Up @@ -520,8 +510,6 @@
"hosting_tab_DOMAINS_configuration_add_loading_error_configuration": "Se ha producido un error al cargar la información (el estado de su configuración está en error).",
"hosting_tab_DOMAINS_configuration_add_step1_title": "Va a añadir un dominio a su alojamiento compartido <strong class=\"font-italic\">{{t0}}</strong>",
"hosting_tab_DOMAINS_configuration_add_step1_no_db_left": "No puede asociar más dominios a su alojamiento compartido.",
"hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "Su solución actual solo le permite instalar un sitio web. Para disfrutar de un sitio web adicional, elija uno de nuestros planes de hosting superiores.",
"hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Cambiar de plan",
"hosting_tab_DOMAINS_configuration_add_step1_ovh_search_placeholder": "Buscar un dominio",
"hosting_tab_DOMAINS_configuration_add_step1_ovh_search_no_result_found": "No hay resultados",
"hosting_tab_DOMAINS_configuration_add_step1_ovh": "Añadir un dominio registrado con OVHcloud",
Expand Down Expand Up @@ -1063,7 +1051,6 @@
"hosting_order_upgrade_success": "El pedido número <a href='{{t0}}' target='_blank'>{{t1}}</a> se ha registrado correctamente.",
"hosting_order_upgrade_error": "Se ha producido un error al cambiar el plan de web hosting.",
"hosting_order_upgrade_modal_header": "Cambie su oferta",
"hosting_order_upgrade_modal_header_description": "¿Su proyecto está cambiando? Blog, sitio web profesional, plataforma de e-commerce o aplicación web: elija el producto más adaptado a sus nuevas necesidades.",
"hosting_order_upgrade_step_header_offer": "Solución",
"hosting_order_upgrade_step_header_duration": "Duración",
"hosting_order_upgrade_step_header_start_time": "Hora de la actualización",
Expand Down Expand Up @@ -1358,5 +1345,19 @@
"hosting_dashboard_service_common_inactive": "Inactivo",
"hosting_dashboard_email_offer_get_error": "No se ha podido cargar la dirección de correo.",
"hosting_dashboard_stats_status": "Beta",
"hosting_dashboard_tabs_dropdown": "Más"
}
"hosting_dashboard_tabs_dropdown": "Más",
"hosting_dashboard_service_offer_HOSTING_FREE_100_M": "Alojamiento gratuito de 100M",
"hosting_dashboard_service_offer_HOSTING_STARTER_OVH": "Starter",
"hosting_dashboard_service_offer_HOSTING_STARTER": "Starter",
"hosting_dashboard_service_offer_HOSTING_PERSO": "Personal",
"hosting_dashboard_service_offer_HOSTING_PRO": "Pro",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_1": "Performance 1",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_2": "Performance 2",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_3": "Performance 3",
"hosting_dashboard_service_offer_HOSTING_PERFORMANCE_4": "Performance 4",
"hosting_dashboard_service_change_offer_explanation_only_one": "Solo dispone de una base de datos con su solución actual. Para disfrutar de bases de datos adicionales, elija una de nuestras ofertas superiores.",
"hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "Su solución actual solo le permite instalar un sitio web. Para disfrutar de un sitio web adicional, elija uno de nuestros planes de hosting superiores.",
"hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Cambiar de plan",
"hosting_order_upgrade_modal_header_description": "¿Su proyecto está cambiando? Blog, sitio web profesional, plataforma de e-commerce o aplicación web: elija el producto más adaptado a sus nuevas necesidades.",
"hosting_order_upgrade_no_contract": "No hay ningún contrato pendiente de validación."
}
Loading

0 comments on commit fa09d08

Please sign in to comment.