fix(dedicated): fix conflict and linter

ref: release-infra-w49 Signed-off-by: soufien mhelhali <[email protected]>
ovh · Dec 3, 2024 · 5632ae5 · 5632ae5
1 parent 7ae95bc
commit 5632ae5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv6/ipv6.controller.js b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv6/ipv6.controller.js
@@ -194,7 +194,7 @@ export default class AgoraIpV6OrderController {
     this.trackSelectRegion(
       this.model.selectedPlan.location.replaceAll(' ', '-'),
     );
-    let trakingService = '';
+
     const { planCode, regionId } = this.model.selectedPlan;
     const productToOrder = this.IpAgoraOrder.constructor.createProductToOrder({
       productId: 'ip',
@@ -207,10 +207,9 @@ export default class AgoraIpV6OrderController {
     });
 
     this.atInternet.trackClick({
-      name: `${FUNNEL_TRACKING_PREFIX}button::add_additional_ip::confirm::ipv6_${trakingService}_${this.model.selectedPlan.location.replaceAll(
-        ' ',
-        '-',
-      )}__free`,
+      name: `${FUNNEL_TRACKING_PREFIX}button::add_additional_ip::confirm::ipv6_${
+        this.model.selectedService
+      }_${this.model.selectedPlan.location.replaceAll(' ', '-')}__free`,
       type: 'action',
       level2: 57,
     });

diff --git a/...modules/netapp/src/dashboard/volumes/dashboard/snapshots/translations/Messages_it_IT.json b/...modules/netapp/src/dashboard/volumes/dashboard/snapshots/translations/Messages_it_IT.json
@@ -30,12 +30,9 @@
   "netapp_volumes_snapshots_policies_apply_error": "Non è stato possibile applicare la regola. Ti preghiamo di riprovare.",
   "netapp_volumes_snapshots_type_automatic": "Automatico",
   "netapp_volumes_snapshots_type_system": "Sistema",
-<<<<<<< HEAD
-  "netapp_volumes_snapshots_created_at_helper": "Le date sono specificate in formato UTC"
-=======
+  "netapp_volumes_snapshots_created_at_helper": "Le date sono specificate in formato UTC",
   "netapp_volumes_snapshots_actions_hold": "Salva",
   "netapp_volumes_snapshots_hold_action_doing": "Il backup del tuo Snapshot è stato preso in carico e sarà effettivo entro pochi istanti.",
   "netapp_volumes_snapshots_hold_action_success": "Il backup del tuo Snapshot è stato effettuato correttamente.",
   "netapp_volumes_snapshots_hold_action_error": "Si è verificato un problema durante il backup del tuo Snapshot"
->>>>>>> 826be6c2f7 (fix(i18n): add missing translations [CDS 3519])
 }