fix(web.hosting): fix ip information if ipcountry is selected

ref: MANAGER-16625 Signed-off-by: Guillaume Hyenne <[email protected]>
ovh · Jan 10, 2025 · d897575 · d897575
1 parent f04e35c
commit d897575
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/...ges/manager/apps/web/client/app/hosting/multisite/add/hosting-multisite-add.controller.js b/...ges/manager/apps/web/client/app/hosting/multisite/add/hosting-multisite-add.controller.js
@@ -110,11 +110,15 @@ angular
         domainWithoutSubdomain: /^([^.]+\.[^.]+)$/,
       };
 
-      $scope.getHostingIp = (hosting, activeCDN, ipv6) =>
-        hosting[
-          (activeCDN === 'ACTIVE' ? 'hostingIp' : 'clusterIp') +
-            (ipv6 ? 'v6' : '')
-        ];
+      $scope.getHostingIp = (hosting, activeCDN, ipv6) => {
+        const selectedCountryIp = $scope.selected.countryIp;
+        return selectedCountryIp
+          ? selectedCountryIp[ipv6 ? 'ipv6' : 'ip']
+          : hosting[
+              (activeCDN === 'ACTIVE' ? 'hostingIp' : 'clusterIp') +
+                (ipv6 ? 'v6' : '')
+            ];
+      };
 
       $scope.isPathValid = () =>
         Hosting.constructor.isPathValid($scope.selected.path);
@@ -168,7 +172,7 @@ angular
           $scope.model.hosting &&
           $scope.model.options &&
           $scope.model.domainsCount >=
-            $scope.model.capabilities.attachedDomains &&
+            $scope.model.capabilities?.attachedDomains &&
           !$scope.model.moreThanOneDomainCountWithOneAttached
         );
       };

diff --git a/...ger/apps/web/client/app/hosting/multisite/domain-configuration/configuration.component.js b/...ger/apps/web/client/app/hosting/multisite/domain-configuration/configuration.component.js
@@ -10,7 +10,6 @@ export default {
     firewall: '=',
     hosting: '<',
     ipLocation: '=',
-    ipv6: '=',
     ownLog: '=',
     ownLogDomain: '=',
     path: '=',