diff --git a/packages/manager/modules/billing-components/src/components/cancellation-form/billing-confirmTerminate.service.js b/packages/manager/modules/billing-components/src/components/cancellation-form/billing-confirmTerminate.service.js index 8c0ccb692623..364301571359 100644 --- a/packages/manager/modules/billing-components/src/components/cancellation-form/billing-confirmTerminate.service.js +++ b/packages/manager/modules/billing-components/src/components/cancellation-form/billing-confirmTerminate.service.js @@ -55,10 +55,6 @@ export default class BillingTerminate { return this.$http.post(`/services/${serviceId}/terminate`); } - serviceTerminationForVrack(serviceId) { - return this.$http.post(`/vrack/${serviceId}/terminate`); - } - getTerminationForm(serviceId) { return this.OvhApiServices.Form() .v6() diff --git a/packages/manager/modules/billing-components/src/components/services-actions/services-actions.component.js b/packages/manager/modules/billing-components/src/components/services-actions/services-actions.component.js index dfddbd2c8712..4b087722c065 100644 --- a/packages/manager/modules/billing-components/src/components/services-actions/services-actions.component.js +++ b/packages/manager/modules/billing-components/src/components/services-actions/services-actions.component.js @@ -4,7 +4,6 @@ import template from './services-actions.html'; export default { bindings: { billingManagementAvailability: '<', - deleteVrackAvailability: '<', service: '<', trackingPrefix: '@?', trackingPage: '@?', diff --git a/packages/manager/modules/billing-components/src/components/services-actions/services-actions.controller.js b/packages/manager/modules/billing-components/src/components/services-actions/services-actions.controller.js index 5d8f5affb4b3..94666b26f406 100644 --- a/packages/manager/modules/billing-components/src/components/services-actions/services-actions.controller.js +++ b/packages/manager/modules/billing-components/src/components/services-actions/services-actions.controller.js @@ -65,12 +65,9 @@ export default class ServicesActionsCtrl { } canResiliate() { - if (this.service.serviceType === this.SERVICE_TYPE.VRACK) { - return this.deleteVrackAvailability && !!this.resiliateLink; - } - return ![ SERVICE_TYPE.PACK_XDSL, + SERVICE_TYPE.VRACK, SERVICE_TYPE.VMWARE_CLOUD_DIRECTOR_ORGANIZATION, ].includes(this.service.serviceType); } diff --git a/packages/manager/modules/billing-components/src/components/utils/billing.links.service.js b/packages/manager/modules/billing-components/src/components/utils/billing.links.service.js index 7b1b881573a8..608be0579ccf 100644 --- a/packages/manager/modules/billing-components/src/components/utils/billing.links.service.js +++ b/packages/manager/modules/billing-components/src/components/utils/billing.links.service.js @@ -100,11 +100,6 @@ export default class BillingLinksService { ? resiliationByEndRuleLink : `${autorenewLink}/delete-all-dom?serviceId=${service.serviceId}&serviceType=${service.serviceType}`; break; - case SERVICE_TYPE.VRACK: - if (service.status !== 'suspended') { - links.resiliateLink = `${autorenewLink}/terminate-vrack?service=${service.serviceId}${serviceTypeParam}`; - } - break; case SERVICE_TYPE.OKMS: case SERVICE_TYPE.VRACK_SERVICES: case SERVICE_TYPE.LICENSE_HYCU: diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/component.js b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/component.js deleted file mode 100644 index dabe2a119f69..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/component.js +++ /dev/null @@ -1,14 +0,0 @@ -import template from './template.html'; -import controller from './controller'; - -export default { - bindings: { - goBack: '<', - service: '<', - serviceType: '<', - isEmpty: '<', - }, - controller, - template, - name: 'billingAutorenewTerminateVrack', -}; diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/constants.js b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/constants.js deleted file mode 100644 index 203add1344d7..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/constants.js +++ /dev/null @@ -1,5 +0,0 @@ -export const TERMINATE_PATTERN = /^TERMINATE$/; - -export default { - TERMINATE_PATTERN, -}; diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/controller.js b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/controller.js deleted file mode 100644 index c8e2d14f4a6a..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/controller.js +++ /dev/null @@ -1,34 +0,0 @@ -import { TERMINATE_PATTERN } from './constants'; - -export default class TerminateVrackController { - /* @ngInject */ - constructor($translate, BillingTerminate) { - this.TERMINATE_PATTERN = TERMINATE_PATTERN; - this.$translate = $translate; - this.BillingTerminate = BillingTerminate; - } - - terminate() { - this.BillingTerminate.serviceTerminationForVrack(this.service) - .then(() => this.onSuccess()) - .catch((error) => this.onError({ error })); - } - - onSuccess() { - this.goBack( - this.$translate.instant( - `autorenew_agora_terminate_service_success_VRACK`, - ), - 'success', - ); - } - - onError(error) { - this.goBack( - this.$translate.instant(`autorenew_agora_terminate_service_error_VRACK`, { - error: error?.data?.message, - }), - 'danger', - ); - } -} diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/index.js b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/index.js deleted file mode 100644 index d04d0f812cc1..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/index.js +++ /dev/null @@ -1,25 +0,0 @@ -import angular from 'angular'; -import angularTranslate from 'angular-translate'; -import ngAtInternet from '@ovh-ux/ng-at-internet'; -import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader'; -import '@ovh-ux/ui-kit'; -import uiRouter from '@uirouter/angularjs'; - -import component from './component'; -import routing from './routing'; - -const moduleName = 'ovhManagerBillingAutorenewTerminateVrack'; - -angular - .module(moduleName, [ - angularTranslate, - ngAtInternet, - ngTranslateAsyncLoader, - 'oui', - uiRouter, - ]) - .config(routing) - .component(component.name, component) - .run(/* @ngTranslationsInject:json ./translations */); - -export default moduleName; diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/routing.js b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/routing.js deleted file mode 100644 index 7da55d0aff4c..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/routing.js +++ /dev/null @@ -1,35 +0,0 @@ -export default /* @ngInject */ ($stateProvider) => { - $stateProvider.state('app.account.billing.autorenew.terminateVrack', { - url: '/terminate-vrack?service&serviceType', - views: { - modal: { - component: 'billingAutorenewTerminateVrack', - }, - }, - layout: 'modal', - resolve: { - goBack: /* @ngInject */ (goToAutorenew) => goToAutorenew, - service: /* @ngInject */ ($transition$) => $transition$.params().service, - serviceType: /* @ngInject */ ($transition$) => - $transition$.params().serviceType, - isEmpty: /* @ngInject */ (OvhApiVrack, service) => - OvhApiVrack.Aapi() - .services({ serviceName: service }) - .$promise.then((allServicesParam) => { - const services = Object.entries(allServicesParam).filter( - ([, value]) => { - return Array.isArray(value) && value.length; - }, - ); - return !services.length; - }) - .catch(() => { - return false; - }), - breadcrumb: () => null, - }, - atInternet: { - ignore: true, - }, - }); -}; diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/template.html b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/template.html deleted file mode 100644 index ec65d14fcc52..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/template.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_de_DE.json b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_de_DE.json deleted file mode 100644 index 73b0e1a7bff5..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_de_DE.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "autorenew_agora_terminate_vrack_blocked_title": "Mein vRack löschen", - "autorenew_agora_terminate_vrack_blocked_description": "Um Ihr vRack zu löschen, müssen Sie zuerst alle damit verbundenen Dienste trennen.", - "autorenew_agora_terminate_vrack_blocked_close": "Schließen", - "autorenew_agora_terminate_service_VRACK": "vRack löschen", - "autorenew_agora_terminate_service_success_VRACK": "Ihre Anfrage zur Löschung Ihres vRack wurde registriert. Eine E-Mail mit weiteren Informationen zur Vorgehensweise wurde soeben an Sie versandt.", - "autorenew_agora_terminate_service_error_VRACK": "Bei der Anfrage zur Löschung Ihres vRacks ist ein Fehler aufgetreten. {{error}}" -} diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_en_GB.json b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_en_GB.json deleted file mode 100644 index 4d8e91ca217b..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_en_GB.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "autorenew_agora_terminate_vrack_blocked_title": "Delete my vRack", - "autorenew_agora_terminate_vrack_blocked_description": "To delete your vRack, you have to first disconnect all of the services linked to it", - "autorenew_agora_terminate_vrack_blocked_close": "Close", - "autorenew_agora_terminate_service_VRACK": "Delete vRack", - "autorenew_agora_terminate_service_success_VRACK": "Your vRack deletion request has been submitted. You have been sent an email detailing the steps to follow.", - "autorenew_agora_terminate_service_error_VRACK": "An error has occurred submitting your vRack deletion request. {{error}}" -} diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_es_ES.json b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_es_ES.json deleted file mode 100644 index de3bdf04e61a..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_es_ES.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "autorenew_agora_terminate_vrack_blocked_title": "Eliminar mi vRack", - "autorenew_agora_terminate_vrack_blocked_description": "Para eliminar el vRack, deberá desconectar previamente todos los servicios asociados.", - "autorenew_agora_terminate_vrack_blocked_close": "Cerrar", - "autorenew_agora_terminate_service_VRACK": "Eliminar vRack", - "autorenew_agora_terminate_service_success_VRACK": "La solicitud de eliminación del vRack se ha enviado correctamente. Le hemos enviado un mensaje de correo electrónico con el procedimiento que debe seguir.", - "autorenew_agora_terminate_service_error_VRACK": "Se ha producido un error al solicitar la eliminación del vRack. {{error}}" -} diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_fr_CA.json b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_fr_CA.json deleted file mode 100644 index 07714c8520d5..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_fr_CA.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "autorenew_agora_terminate_vrack_blocked_title": "Supprimer mon Vrack", - "autorenew_agora_terminate_vrack_blocked_description": "Afin de supprimer votre Vrack vous devez au préalable deconnecter tous les services qui y sont ratachés", - "autorenew_agora_terminate_vrack_blocked_close": "Fermer", - "autorenew_agora_terminate_service_VRACK": "Supprimer Vrack", - "autorenew_agora_terminate_service_warning_VRACK": "Veuillez confirmer la suppression de Vrack", - "autorenew_agora_terminate_service_success_VRACK": "Votre demande de suppression de votre Vrack a été prise en compte. Un e-mail contenant la procédure vous a été envoyé.", - "autorenew_agora_terminate_service_error_VRACK": "Une erreur est survenue lors de la demande de suppression de votre Vrack. {{error}}" -} diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_fr_FR.json b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_fr_FR.json deleted file mode 100644 index 07714c8520d5..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_fr_FR.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "autorenew_agora_terminate_vrack_blocked_title": "Supprimer mon Vrack", - "autorenew_agora_terminate_vrack_blocked_description": "Afin de supprimer votre Vrack vous devez au préalable deconnecter tous les services qui y sont ratachés", - "autorenew_agora_terminate_vrack_blocked_close": "Fermer", - "autorenew_agora_terminate_service_VRACK": "Supprimer Vrack", - "autorenew_agora_terminate_service_warning_VRACK": "Veuillez confirmer la suppression de Vrack", - "autorenew_agora_terminate_service_success_VRACK": "Votre demande de suppression de votre Vrack a été prise en compte. Un e-mail contenant la procédure vous a été envoyé.", - "autorenew_agora_terminate_service_error_VRACK": "Une erreur est survenue lors de la demande de suppression de votre Vrack. {{error}}" -} diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_it_IT.json b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_it_IT.json deleted file mode 100644 index 93a69d219ca7..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_it_IT.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "autorenew_agora_terminate_vrack_blocked_title": "Eliminare la tua vRack", - "autorenew_agora_terminate_vrack_blocked_description": "Per eliminare la tua vRrack è prima necessario disconnettere tutti i servizi ad essa associati.", - "autorenew_agora_terminate_vrack_blocked_close": "Chiudere", - "autorenew_agora_terminate_service_VRACK": "Eliminare la vRack", - "autorenew_agora_terminate_service_success_VRACK": "La tua richiesta di eliminazione della vRack è stata presa in carico. Ti abbiamo inviato un’email con la procedura da seguire.", - "autorenew_agora_terminate_service_error_VRACK": "Si è verificato un errore durante la richiesta di eliminazione della tua vRack: {{error}}" -} diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_pl_PL.json b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_pl_PL.json deleted file mode 100644 index 0407e566f19c..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_pl_PL.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "autorenew_agora_terminate_vrack_blocked_title": "Usuń vRack", - "autorenew_agora_terminate_vrack_blocked_description": "Aby usunąć vRack, najpierw należy odłączyć wszystkie przypisane do niego usługi", - "autorenew_agora_terminate_vrack_blocked_close": "Zamknij", - "autorenew_agora_terminate_service_VRACK": "Usuń vRack", - "autorenew_agora_terminate_service_success_VRACK": "Dyspozycja usunięcia vRacka została przyjęta. Otrzymasz e-mail z opisem dalszej procedury.", - "autorenew_agora_terminate_service_error_VRACK": "Wystąpił błąd podczas usuwania vRacka. {{error}}" -} diff --git a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_pt_PT.json b/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_pt_PT.json deleted file mode 100644 index c4f821fccb60..000000000000 --- a/packages/manager/modules/billing/src/autoRenew/actions/terminate-vrack/translations/Messages_pt_PT.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "autorenew_agora_terminate_vrack_blocked_title": "Eliminar o meu vRack", - "autorenew_agora_terminate_vrack_blocked_description": "Para eliminar o seu vRack, deve desligar previamente todos os serviços que estão associados ao mesmo.", - "autorenew_agora_terminate_vrack_blocked_close": "Fechar", - "autorenew_agora_terminate_service_VRACK": "Eliminar o vRack", - "autorenew_agora_terminate_service_success_VRACK": "O seu pedido de eliminação do seu vRack foi registado. Um e-mail com o procedimento foi-lhe enviado.", - "autorenew_agora_terminate_service_error_VRACK": "Ocorreu um erro aquando do pedido de eliminação do seu vRack. {{error}}" -} diff --git a/packages/manager/modules/billing/src/autoRenew/autorenew.component.js b/packages/manager/modules/billing/src/autoRenew/autorenew.component.js index 5658eee2263c..b19e0bd6e6dd 100644 --- a/packages/manager/modules/billing/src/autoRenew/autorenew.component.js +++ b/packages/manager/modules/billing/src/autoRenew/autorenew.component.js @@ -19,7 +19,6 @@ export default { hasAutoRenew: '<', homeLink: '<', isAutorenewManagementAvailable: '<', - canDeleteVrack: '<', isAutorenew2016DeploymentBannerAvailable: '<', isEnterpriseCustomer: '<', nicBilling: '<', diff --git a/packages/manager/modules/billing/src/autoRenew/autorenew.html b/packages/manager/modules/billing/src/autoRenew/autorenew.html index 0b3e7528869f..bcd8b6868ebc 100644 --- a/packages/manager/modules/billing/src/autoRenew/autorenew.html +++ b/packages/manager/modules/billing/src/autoRenew/autorenew.html @@ -244,7 +244,6 @@ tracking-page="{{ $ctrl.trackingPage }}" user="$ctrl.currentUser" billing-management-availability="$ctrl.isAutorenewManagementAvailable" - delete-vrack-availability="$ctrl.canDeleteVrack" > diff --git a/packages/manager/modules/billing/src/autoRenew/autorenew.module.js b/packages/manager/modules/billing/src/autoRenew/autorenew.module.js index 4608d16eb06f..20a7e9b9688a 100644 --- a/packages/manager/modules/billing/src/autoRenew/autorenew.module.js +++ b/packages/manager/modules/billing/src/autoRenew/autorenew.module.js @@ -31,7 +31,6 @@ import terminateHostingWeb from './actions/terminateHostingWeb/hosting-web.modul import terminatePrivateDatabase from './actions/terminatePrivateDatabase/private-database.module'; import terminateWebCoach from './actions/terminate-webcoach/terminate-webcoach.module'; import terminateAllDOm from './actions/terminate-all-dom/module'; -import terminateVrack from './actions/terminate-vrack'; import update from './actions/update/update.module'; import warnNicBilling from './actions/warnNicBilling/warnNicBilling.module'; import warnPendingDebt from './actions/warnPendingDebt/pending-debt.module'; @@ -73,7 +72,6 @@ angular terminatePrivateDatabase, terminateWebCoach, terminateAllDOm, - terminateVrack, uiRouter, update, warnNicBilling, diff --git a/packages/manager/modules/billing/src/autoRenew/autorenew.routing.js b/packages/manager/modules/billing/src/autoRenew/autorenew.routing.js index 67a6b14c92a9..5a58546718ac 100644 --- a/packages/manager/modules/billing/src/autoRenew/autorenew.routing.js +++ b/packages/manager/modules/billing/src/autoRenew/autorenew.routing.js @@ -95,7 +95,6 @@ export default /* @ngInject */ ($stateProvider, coreConfigProvider) => { }, featureAvailability: /* @ngInject */ (ovhFeatureFlipping) => ovhFeatureFlipping.checkFeatureAvailability([ - 'vrack:delete', 'billing:management', 'billing:autorenew2016Deployment', ]), @@ -108,8 +107,6 @@ export default /* @ngInject */ ($stateProvider, coreConfigProvider) => { featureAvailability?.isFeatureAvailable( 'billing:autorenew2016Deployment', ) || false, - canDeleteVrack: /* @ngInject */ (featureAvailability) => - featureAvailability?.isFeatureAvailable('vrack:delete') || false, hideBreadcrumb: /* @ngInject */ () => true, trackingPrefix: () => 'dedicated::account::billing::autorenew', },