Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(dedicated.pcc): move terminate action menu to tile button #14824

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat(dedicated.pcc): move terminate action menu to tile button #14824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...s/dedicated/client/app/components/dedicated-cloud/dashboard/dedicatedCloud-dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
data-go-to-drp-datacenter-selection="$ctrl.goToDrpDatacenterSelection"
data-go-to-vpn-configuration="$ctrl.goToVpnConfiguration"
data-is-drp-action-possible="$ctrl.isDrpActionPossible"
data-on-terminate="$ctrl.onTerminate"
data-on-ml-subscribe="$ctrl.onMlSubscribe"
data-order-security-option="$ctrl.orderSecurityOption"
data-order-vmware-option="$ctrl.orderVmwareOption"
Expand Down
1 change: 0 additions & 1 deletion ...apps/dedicated/client/app/components/dedicated-cloud/dashboard/legacy/legacy.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default {

isDrpActionPossible: '<',
onMlSubscribe: '<',
onTerminate: '<',
orderSecurityOption: '<',
orderVmwareOption: '<',
productId: '<',
Expand Down
18 changes: 9 additions & 9 deletions ...app/components/dedicated-cloud/dashboard/tiles/service-management/service-management.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@
data-translate="ovhManagerPccDashboardServiceManagement_renewal_actionMenu_order"
></span>
</oui-action-menu-item>

<oui-action-menu-item
data-ng-if="!$ctrl.currentUser.isEnterprise"
data-on-click="$ctrl.onTerminate()"
>
<span
data-translate="ovhManagerPccDashboardServiceManagement_renewal_actionMenu_delete"
></span>
</oui-action-menu-item>
</oui-action-menu>
</div>
</div>

<oui-tile-button
data-ng-if=":: !$ctrl.currentUser.isEnterprise"
data-on-click=":: $ctrl.onTerminate()"
>
<span
data-translate="ovhManagerPccDashboardServiceManagement_renewal_terminate"
></span>
</oui-tile-button>
</oui-tile>
10 changes: 5 additions & 5 deletions ...nents/dedicated-cloud/dashboard/tiles/service-management/translations/Messages_fr_FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"ovhManagerPccDashboardServiceManagement_heading": "Gestion du service",
"ovhManagerPccDashboardServiceManagement_heading": "Gestion du service",

"ovhManagerPccDashboardServiceManagement_mailingList_term": "Mailing list",
"ovhManagerPccDashboardServiceManagement_mailingList_actionMenu_subscribe": "S'abonner à la mailing list",
"ovhManagerPccDashboardServiceManagement_mailingList_term": "Mailing list",
"ovhManagerPccDashboardServiceManagement_mailingList_actionMenu_subscribe": "S'abonner à la mailing list",

"ovhManagerPccDashboardServiceManagement_renewal_actionMenu_order": "Commander une licence",
"ovhManagerPccDashboardServiceManagement_renewal_actionMenu_delete": "Supprimer le service"
"ovhManagerPccDashboardServiceManagement_renewal_actionMenu_order": "Commander une licence",
"ovhManagerPccDashboardServiceManagement_renewal_terminate": "Résilier le service"
}
46 changes: 23 additions & 23 deletions ...edicated/client/app/components/dedicated-cloud/terminate/translations/Messages_fr_FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"dedicated_cloud_close_service_form_label": "Sélectionner l'action à effectuer",
"dedicated_cloud_close_service_form_option_terminate": "Supprimer le service immédiatement",
"dedicated_cloud_close_service_form_option_delete_at_expiration": "Supprimer le service à la date d'expiration",
"dedicated_cloud_service_form_option_cancel": "Annuler la suppression du service",
"dedicated_cloud_close_service_delete_at_expiration_activate_success": "La demande de suppression de ce serveur à la date d'expiration a bien été prise en compte",
"dedicated_cloud_close_service_delete_at_expiration_activate_error": "Une erreur est survenue lors de la demande de suppression à expiration de ce serveur :",
"dedicated_cloud_close_service_cancel_success": "La demande de suppression de ce serveur a bien été suspendue.",
"dedicated_cloud_close_service_cancel_error": "Une erreur est survenue lors de la suspension de la demande de suppression de ce serveur :",
"dedicatedCloud_close_service": "Supprimer mon service",
"dedicatedCloud_close_service_warning": "La suppression de cet élément entraînera l'effacement définitif de toutes les données correspondantes ainsi que la suppression des blocs d'IP associés. L'action de suppression n'octroie aucun remboursement.",
"server_close_service_form_label": "Sélectionner l'action à effectuer",
"dedicatedCloud_close_service_desc": "Un email contenant la procédure de suppression de cette infrastructure vous sera envoyé.",
"dedicatedCloud_close_service_question": "Voulez-vous continuer ?",
"server_close_service_form_option_terminate": "Supprimer le service immédiatement",
"server_close_service_form_option_delete_at_expiration": "Supprimer le service à la date d'expiration",
"server_close_service_form_option_cancel": "Annuler la suppression du service",
"dedicatedCloud_close_service_success": "La demande de suppression de cette infrastructure a bien été prise en compte. Un email contenant la procédure vous sera envoyé.",
"dedicatedCloud_close_service_error": "Une erreur est survenue lors de la demande de suppression de cette infrastructure :",
"server_close_service_delete_at_expiration_activate_success": "La demande de suppression de ce serveur à la date d'expiration a bien été prise en compte",
"server_close_service_delete_at_expiration_activate_error": "Une erreur est survenue lors de la demande de suppression à expiration de ce serveur :",
"server_close_service_cancel_success": "La demande de suppression de ce serveur a bien été suspendue.",
"server_close_service_cancel_error": "Une erreur est survenue lors de la suspension de la demande de suppression de ce serveur :"
}
"dedicated_cloud_close_service_form_label": "Sélectionner l'action à effectuer",
"dedicated_cloud_close_service_form_option_terminate": "Supprimer le service immédiatement",
"dedicated_cloud_close_service_form_option_delete_at_expiration": "Supprimer le service à la date d'expiration",
"dedicated_cloud_service_form_option_cancel": "Annuler la suppression du service",
"dedicated_cloud_close_service_delete_at_expiration_activate_success": "La demande de suppression de ce serveur à la date d'expiration a bien été prise en compte",
"dedicated_cloud_close_service_delete_at_expiration_activate_error": "Une erreur est survenue lors de la demande de suppression à expiration de ce serveur :",
"dedicated_cloud_close_service_cancel_success": "La demande de suppression de ce serveur a bien été suspendue.",
"dedicated_cloud_close_service_cancel_error": "Une erreur est survenue lors de la suspension de la demande de suppression de ce serveur :",
"dedicatedCloud_close_service": "Résilier mon service",
"dedicatedCloud_close_service_warning": "La suppression de cet élément entraînera l'effacement définitif de toutes les données correspondantes ainsi que la suppression des blocs d'IP associés. L'action de suppression n'octroie aucun remboursement.",
"server_close_service_form_label": "Sélectionner l'action à effectuer",
"dedicatedCloud_close_service_desc": "Un email contenant la procédure de suppression de cette infrastructure vous sera envoyé.",
"dedicatedCloud_close_service_question": "Voulez-vous continuer ?",
"server_close_service_form_option_terminate": "Supprimer le service immédiatement",
"server_close_service_form_option_delete_at_expiration": "Supprimer le service à la date d'expiration",
"server_close_service_form_option_cancel": "Annuler la suppression du service",
"dedicatedCloud_close_service_success": "La demande de suppression de cette infrastructure a bien été prise en compte. Un email contenant la procédure vous sera envoyé.",
"dedicatedCloud_close_service_error": "Une erreur est survenue lors de la demande de suppression de cette infrastructure :",
"server_close_service_delete_at_expiration_activate_success": "La demande de suppression de ce serveur à la date d'expiration a bien été prise en compte",
"server_close_service_delete_at_expiration_activate_error": "Une erreur est survenue lors de la demande de suppression à expiration de ce serveur :",
"server_close_service_cancel_success": "La demande de suppression de ce serveur a bien été suspendue.",
"server_close_service_cancel_error": "Une erreur est survenue lors de la suspension de la demande de suppression de ce serveur :"
}
Loading