feat(dedicated): add vrack to my services page (#12440)

ref: MANAGER-12690 Signed-off-by: soufien mhelhali <[email protected]>
ovh · Oct 21, 2024 · a66d8b2 · a66d8b2
1 parent 52d281b
commit a66d8b2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/...r/modules/billing-components/src/components/services-actions/service-actions.constants.js b/...r/modules/billing-components/src/components/services-actions/service-actions.constants.js
@@ -12,6 +12,7 @@ export const SERVICE_TYPE = {
   ALL_DOM: 'ALL_DOM',
   OKMS: 'OKMS_RESOURCE',
   VRACK_SERVICES: 'VRACK_SERVICES_RESOURCE',
+  VRACK: 'VRACK',
 };
 
 export const RENEW_URL = {

diff --git a/...modules/billing-components/src/components/services-actions/services-actions.controller.js b/...modules/billing-components/src/components/services-actions/services-actions.controller.js
@@ -37,7 +37,9 @@ export default class ServicesActionsCtrl {
     return fetchAutoRenewLink.promise.then((link) => {
       this.autorenewLink = link;
       this.isLoading = false;
-      this.initLinks();
+      if (this.service.SERVICE_TYPE !== this.SERVICE_TYPE.VRACK) {
+        this.initLinks();
+      }
     });
   }
 
@@ -131,6 +133,12 @@ export default class ServicesActionsCtrl {
     }`;
   }
 
+  canResiliate() {
+    return ![this.SERVICE_TYPE.PACK_XDSL, this.SERVICE_TYPE.VRACK].includes(
+      this.service.serviceType,
+    );
+  }
+
   getExchangeBilling() {
     if (/\/service\//.test(this.service.serviceId)) {
       const [organization, exchangeName] = this.service.serviceId.split(

diff --git a/.../manager/modules/billing-components/src/components/services-actions/services-actions.html b/.../manager/modules/billing-components/src/components/services-actions/services-actions.html
@@ -136,7 +136,7 @@
     <!-- /Pack XDSL -->
 
     <div
-        data-ng-if="$ctrl.service.serviceType !== $ctrl.SERVICE_TYPE.PACK_XDSL && (!$ctrl.service.shouldDeleteAtExpiration() || !$ctrl.service.isResiliated()) && !$ctrl.service.hasDebt() && !$ctrl.service.hasPendingResiliation()"
+        data-ng-if="$ctrl.canResiliate() && (!$ctrl.service.shouldDeleteAtExpiration() || !$ctrl.service.isResiliated()) && !$ctrl.service.hasDebt() && !$ctrl.service.hasPendingResiliation()"
     >
         <oui-action-menu-item
             ng-if="$ctrl.resiliateLink && ($ctrl.service.hasAdminRights($ctrl.user.auth.account) || $ctrl.service.hasAdminRights($ctrl.user.nichandle))"
@@ -196,7 +196,7 @@
 
     <!-- Service with termination asked by the customer -->
     <oui-action-menu-item
-        ng-if="$ctrl.cancelResiliationLink && ($ctrl.service.canBeUnresiliated($ctrl.user.nichandle) || $ctrl.service.canCancelResiliationByEndRule())"
+        ng-if="$ctrl.service.serviceType !== $ctrl.SERVICE_TYPE.VRACK && $ctrl.cancelResiliationLink && ($ctrl.service.canBeUnresiliated($ctrl.user.nichandle) || $ctrl.service.canCancelResiliationByEndRule())"
         href="{{:: $ctrl.cancelResiliationLink }}"
         on-click="$ctrl.trackAction('go-to-cancel-resiliation')"
         data-navi-id="go-to-cancel-resiliation"