Skip to content

feat(dedicated): delete vrack from billing autorenew page #14977

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.

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

Merged
merged 3 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ 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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import template from './services-actions.html';
export default {
bindings: {
billingManagementAvailability: '<',
deleteVrackAvailability: '<',
service: '<',
trackingPrefix: '@?',
trackingPage: '@?',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,12 @@ 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);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SERVICE_TYPE } from './constants';
import { SERVICE_TYPE, SUSPENDED_SERVICE } from './constants';

export default class BillingLinksService {
/* @ngInject */
Expand Down Expand Up @@ -103,6 +103,11 @@ export default class BillingLinksService {
? resiliationByEndRuleLink
: `${autorenewLink}/delete-all-dom?serviceId=${service.serviceId}&serviceType=${service.serviceType}`;
break;
case SERVICE_TYPE.VRACK:
if (service.status !== SUSPENDED_SERVICE) {
links.resiliateLink = `${autorenewLink}/terminate-vrack?service=${service.serviceId}${serviceTypeParam}`;
}
break;
case SERVICE_TYPE.OKMS:
case SERVICE_TYPE.VRACK_SERVICES:
case SERVICE_TYPE.LICENSE_HYCU:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export const DEFAULT_DURATION = 'P1M';
export const DEFAULT_TYPE = 'periodic';
export const SUSPENDED_SERVICE = 'suspended';

export const SERVICE_TYPE = {
EMAIL_DOMAIN: 'EMAIL_DOMAIN',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import template from './template.html';
import controller from './controller';

export default {
bindings: {
goBack: '<',
service: '<',
serviceType: '<',
isEmpty: '<',
},
controller,
template,
name: 'billingAutorenewTerminateVrack',
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export const TERMINATE_PATTERN = /^TERMINATE$/;

export default {
TERMINATE_PATTERN,
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
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',
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
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;
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
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,
},
});
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<oui-modal
data-heading="{{:: 'autorenew_agora_terminate_vrack_blocked_title' | translate }}"
data-primary-action="$ctrl.goBack()"
data-primary-label="{{:: 'autorenew_agora_terminate_vrack_blocked_close' | translate }}"
data-secondary-disabled="true"
data-on-dismiss="$ctrl.goBack()"
data-ng-if="!$ctrl.isEmpty"
>
<oui-message data-type="warning" class="mb-2" data-ng-if="!$ctrl.isEmpty">
<span
data-translate="autorenew_agora_terminate_vrack_blocked_description"
></span>
</oui-message>
</oui-modal>

<oui-modal
data-heading="{{:: 'autorenew_agora_terminate_vrack_blocked_title' | translate }}"
data-primary-action="$ctrl.terminate()"
data-primary-disabled="!$ctrl.terminateConfirmation"
data-primary-label="{{:: 'autorenew_service_terminate' | translate }}"
data-secondary-action="$ctrl.goBack()"
data-secondary-label="{{:: 'autorenew_service_terminate_cancel' | translate }}"
data-loading="$ctrl.isDeleting"
data-on-dismiss="$ctrl.goBack()"
data-ng-if="$ctrl.isEmpty"
>
<oui-message data-type="warning" class="mb-2">
<span
data-translate="{{:: 'autorenew_agora_terminate_service_warning_' + $ctrl.serviceType}}"
></span>
</oui-message>
<oui-field
data-label="{{:: 'autorenew_agora_terminate_service_confirm_input' | translate }}"
>
<input
type="text"
class="oui-input"
name="terminateInput"
data-ng-model="$ctrl.terminateConfirmation"
data-ng-pattern="$ctrl.TERMINATE_PATTERN"
required
/>
</oui-field>
</oui-modal>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"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_warning_VRACK": "Bitte bestätigen Sie die Löschung des vRack.",
"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}}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"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_warning_VRACK": "Please confirm that you want to 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}}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"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_warning_VRACK": "Por favor, confirme la eliminación del 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}}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"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}}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"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}}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"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_warning_VRACK": "Conferma l'eliminazione della 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}}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"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_warning_VRACK": "Potwierdź usunięcie vRacka",
"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}}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"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_warning_VRACK": "Confirme a eliminação do 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}}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default {
hasAutoRenew: '<',
homeLink: '<',
isAutorenewManagementAvailable: '<',
canDeleteVrack: '<',
isAutorenew2016DeploymentBannerAvailable: '<',
isEnterpriseCustomer: '<',
nicBilling: '<',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@
tracking-page="{{ $ctrl.trackingPage }}"
user="$ctrl.currentUser"
billing-management-availability="$ctrl.isAutorenewManagementAvailable"
delete-vrack-availability="$ctrl.canDeleteVrack"
>
</billing-services-actions>
</oui-datagrid-column>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ 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';
Expand Down Expand Up @@ -72,6 +73,7 @@ angular
terminatePrivateDatabase,
terminateWebCoach,
terminateAllDOm,
terminateVrack,
uiRouter,
update,
warnNicBilling,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export default /* @ngInject */ ($stateProvider, coreConfigProvider) => {
},
featureAvailability: /* @ngInject */ (ovhFeatureFlipping) =>
ovhFeatureFlipping.checkFeatureAvailability([
'vrack:delete',
'billing:management',
'billing:autorenew2016Deployment',
]),
Expand All @@ -107,6 +108,8 @@ 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',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import template from './template.html';
import controller from './controller';

export default {
bindings: {
goBack: '<',
service: '<',
serviceType: '<',
isEmpty: '<',
},
controller,
template,
name: 'billingAutorenewTerminateVrack',
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export const TERMINATE_PATTERN = /^TERMINATE$/;

export default {
TERMINATE_PATTERN,
};
Loading
Loading