New release hosting collaboration - w45

packages/manager/apps/web/client/app/configuration/configuration.controller.js

@@ -5,14 +5,22 @@ angular.module('App').controller(
   'configurationCtrl',
   class ConfigurationCtrl {
     /* @ngInject */
-    constructor($scope, coreConfig, constants) {
+    constructor($scope, atInternet, coreConfig, constants) {
       this.constants = constants;
       $scope.user = coreConfig.getUser();
+      this.atInternet = atInternet;
       this.banner2024 =
         OVH_WEB_OFFERS_2024[$scope.user.ovhSubsidiary] ||
         OVH_WEB_OFFERS_2024.DEFAULT;
     }
 
+    trackClickWebOfferBanner() {
+      this.atInternet.trackClick({
+        name: 'web::::::banner::link::go-to-special-offers',
+        type: 'action',
+      });
+    }
+
     $onInit() {
       this.guides = this.constants.TOP_GUIDES;
       this.subsidiary = this.user.ovhSubsidiary;

packages/manager/apps/web/client/app/configuration/configuration.html

@@ -4,6 +4,7 @@
             data-ng-if="$ctrl.isOffersBannerActive"
             target="_blank"
             rel="noopener"
+            data-ng-click="$ctrl.trackClickWebOfferBanner()"
             href="{{ :: $ctrl.banner2024.url }}"
         >
             <img

packages/manager/apps/web/client/app/domain/list/list-domain-layout.constants.js

@@ -18,6 +18,7 @@ export const DOMAIN_STATUS = {
   TECHNICAL_SUSPENDED: 'technical_suspended',
   REGISTRY_SUSPENDED: 'registry_suspended',
   AUTORENEW_IN_PROGRESS: 'autorenew_in_progress',
+  AUTORENEW_REGISTRY_IN_PROGRESS: 'autorenew_registry_in_progress',
 };
 
 export const DOMAIN_DNSSEC_STATE = {
@@ -85,6 +86,7 @@ export const DOMAINS_BADGES_STATUS = {
   [DOMAIN_STATUS.TECHNICAL_SUSPENDED]: 'oui-badge_limited-edition',
   [DOMAIN_STATUS.REGISTRY_SUSPENDED]: 'oui-badge_limited-edition',
   [DOMAIN_STATUS.AUTORENEW_IN_PROGRESS]: 'oui-badge_info',
+  [DOMAIN_STATUS.AUTORENEW_REGISTRY_IN_PROGRESS]: 'oui-badge_info',
 };
 
 export const DOMAIN_SUSPENSION_STATE_CLASS = {

packages/manager/apps/web/client/app/domain/list/template.html

@@ -80,15 +80,15 @@
             data-sortable
         >
             <span
-                class="{{:: 'oui-badge ' + $ctrl.DOMAINS_BADGES_STATUS[$value] }}"
-                data-translate="{{:: 'domains_status_' + $value }}"
+                class="{{ ::'oui-badge ' + $ctrl.DOMAINS_BADGES_STATUS[$value] }}"
+                data-translate="{{ ::'domains_status_' + $value }}"
             >
             </span>
             <button
-                data-ng-if="[$ctrl.DOMAIN_STATUS.RESTORABLE, $ctrl.DOMAIN_STATUS.PENDING_INCOMING_TRANSFER , $ctrl.DOMAIN_STATUS.DISPUTE, $ctrl.DOMAIN_STATUS.EXPIRED].includes($value)"
+                data-ng-if="[$ctrl.DOMAIN_STATUS.RESTORABLE, $ctrl.DOMAIN_STATUS.PENDING_INCOMING_TRANSFER , $ctrl.DOMAIN_STATUS.DISPUTE, $ctrl.DOMAIN_STATUS.EXPIRED, $ctrl.DOMAIN_STATUS.AUTORENEW_REGISTRY_IN_PROGRESS].includes($value)"
                 type="button"
                 class="oui-popover-button"
-                data-oui-popover="{{::'domains_status_tooltip_' + $value | translate}}"
+                data-oui-popover="{{ ::'domains_status_tooltip_' + $value | translate }}"
                 data-oui-popover-placement="right"
             ></button>
         </oui-datagrid-column>

packages/manager/apps/web/client/app/domain/translations/Messages_de_DE.json

@@ -108,5 +108,7 @@
   "domains_action_per_line_autorenew_activate": "Automatische Verlängerung aktivieren",
   "domains_action_per_line_autorenew_deactivate": "Automatische Verlängerung deaktivieren",
   "domains_action_per_line_resiliation_cancellation": "Kündigung der Dienstes stornieren",
-  "domains_status_autorenew_in_progress": "Verlängerung wird vorgenommen"
+  "domains_status_autorenew_in_progress": "Verlängerung wird vorgenommen",
+  "domains_status_autorenew_registry_in_progress": "Verlängerung wird vorgenommen",
+  "domains_status_tooltip_autorenew_registry_in_progress": "Die Verlängerung wird bei der Registry abgeschlossen."
 }

packages/manager/apps/web/client/app/domain/translations/Messages_en_GB.json

@@ -108,5 +108,7 @@
   "domains_action_per_line_autorenew_activate": "Enable automatic renewal",
   "domains_action_per_line_autorenew_deactivate": "Disable automatic renewal",
   "domains_action_per_line_resiliation_cancellation": "Cancel service termination",
-  "domains_status_autorenew_in_progress": "Renewal in progress"
+  "domains_status_autorenew_in_progress": "Renewal in progress",
+  "domains_status_autorenew_registry_in_progress": "Renewal in progress",
+  "domains_status_tooltip_autorenew_registry_in_progress": "The renewal process is being finalised with the registry"
 }

packages/manager/apps/web/client/app/domain/translations/Messages_es_ES.json

@@ -108,5 +108,7 @@
   "domains_action_per_line_autorenew_activate": "Activar la renovación automática",
   "domains_action_per_line_autorenew_deactivate": "Desactivar la renovación automática",
   "domains_action_per_line_resiliation_cancellation": "Cancelar la baja del servicio",
-  "domains_status_autorenew_in_progress": "Renovación en curso"
+  "domains_status_autorenew_in_progress": "Renovación en curso",
+  "domains_status_autorenew_registry_in_progress": "Renovación en curso",
+  "domains_status_tooltip_autorenew_registry_in_progress": "La renovación se está completando en el registro"
 }

packages/manager/apps/web/client/app/domain/translations/Messages_fr_CA.json

@@ -36,6 +36,8 @@
   "domains_status_technical_suspended": "Procédure en cours",
   "domains_status_registry_suspended": "Procédure en cours",
   "domains_status_autorenew_in_progress": "Renouvellement en cours",
+  "domains_status_autorenew_registry_in_progress": "Renouvellement en cours",
+  "domains_status_tooltip_autorenew_registry_in_progress": "Le renouvellement est en cours de finalisation auprès du registre",
   "domains_suspension_state_not_suspended": "Actif",
   "domains_suspension_state_suspended": "Inactif",
   "domains_renewal_mode_automatic_renew": "Renouvellement automatique",

packages/manager/apps/web/client/app/domain/translations/Messages_fr_FR.json

@@ -36,6 +36,8 @@
   "domains_status_technical_suspended": "Procédure en cours",
   "domains_status_registry_suspended": "Procédure en cours",
   "domains_status_autorenew_in_progress": "Renouvellement en cours",
+  "domains_status_autorenew_registry_in_progress": "Renouvellement en cours",
+  "domains_status_tooltip_autorenew_registry_in_progress": "Le renouvellement est en cours de finalisation auprès du registre",
   "domains_suspension_state_not_suspended": "Actif",
   "domains_suspension_state_suspended": "Inactif",
   "domains_renewal_mode_automatic_renew": "Renouvellement automatique",

packages/manager/apps/web/client/app/domain/translations/Messages_it_IT.json

@@ -108,5 +108,7 @@
   "domains_action_per_line_autorenew_activate": "Attiva il rinnovo automatico",
   "domains_action_per_line_autorenew_deactivate": "Disattiva il rinnovo automatico",
   "domains_action_per_line_resiliation_cancellation": "Annulla la disattivazione del servizio",
-  "domains_status_autorenew_in_progress": "Rinnovo in corso"
+  "domains_status_autorenew_in_progress": "Rinnovo in corso",
+  "domains_status_autorenew_registry_in_progress": "Rinnovo in corso",
+  "domains_status_tooltip_autorenew_registry_in_progress": "Il rinnovo è in corso di finalizzazione presso il Registro"
 }

packages/manager/apps/web/client/app/domain/translations/Messages_pl_PL.json

@@ -108,5 +108,7 @@
   "domains_action_per_line_autorenew_activate": "Włącz automatyczne odnowienie",
   "domains_action_per_line_autorenew_deactivate": "Wyłącz automatyczne odnowienie",
   "domains_action_per_line_resiliation_cancellation": "Anuluj rezygnację z usługi",
-  "domains_status_autorenew_in_progress": "Trwa odnawianie"
+  "domains_status_autorenew_in_progress": "Trwa odnawianie",
+  "domains_status_autorenew_registry_in_progress": "Trwa odnawianie",
+  "domains_status_tooltip_autorenew_registry_in_progress": "Rejestr finalizuje odnowienie"
 }

packages/manager/apps/web/client/app/domain/translations/Messages_pt_PT.json

@@ -108,5 +108,7 @@
   "domains_action_per_line_autorenew_activate": "Ativar a renovação automática",
   "domains_action_per_line_autorenew_deactivate": "Desativar a renovação automática",
   "domains_action_per_line_resiliation_cancellation": "Anular a rescisão do serviço",
-  "domains_status_autorenew_in_progress": "Renovação em curso"
+  "domains_status_autorenew_in_progress": "Renovação em curso",
+  "domains_status_autorenew_registry_in_progress": "Renovação em curso",
+  "domains_status_tooltip_autorenew_registry_in_progress": "A renovação está em curso de finalização junto do registry"
 }

packages/manager/apps/web/client/app/hosting/hosting.routing.js

@@ -10,16 +10,17 @@ export default /* @ngInject */ ($stateProvider) => {
     redirectTo: (transition) =>
       transition
         .injector()
-        .getAsync('resources')
-        .then((resources) =>
-          resources.data.length === 0
+        .getAsync('noFiltersHosting')
+        .then((noFiltersHosting) =>
+          noFiltersHosting.data.length === 0
             ? { state: 'app.hosting.onboarding' }
             : false,
         ),
     resolve: {
       ...ListLayoutHelper.stateResolves,
       apiPath: () => '/hosting/web',
       dataModel: () => 'hosting.web.Service',
+      noFiltersHosting: /* @ngInject */ ($http) => $http.get('/hosting/web'),
       loadResource: /* @ngInject */ ($translate) => (resource) => {
         const offerPrefix = NEW_OFFERS_NAME[resource.offer];
         const offerName = offerPrefix

packages/manager/apps/web/client/app/hosting/multisite/MULTISITE.html

@@ -485,7 +485,11 @@
                             <td>example.com</td>
                             <td>0</td>
                             <td>TXT</td>
-                            <td data-ng-bind="hosting.token"></td>
+                            <td>
+                                <oui-clipboard
+                                    data-model="hosting.token"
+                                ></oui-clipboard>
+                            </td>
                         </tr>
                     </tbody>
                 </table>

packages/manager/apps/web/client/app/hosting/multisite/git-integration/association/git-association.controller.js

@@ -8,13 +8,15 @@ import {
   GIT_ASSOCIATION_GUIDE_LINK,
   GIT_WEBHOOK_GUIDE_LINK,
 } from './git-association.constants';
+import { TRACKING_MULTISITE_PREFIX } from '../git-integration.constants';
 
 export default class HostingMultisiteGitAssociationController {
   /* @ngInject */
   constructor(
     HostingMultisiteGitAssociationService,
     coreURLBuilder,
     coreConfig,
+    atInternet,
     $translate,
   ) {
     this.REPOSITORY_PLACEHOLDER = REPOSITORY_PLACEHOLDER;
@@ -26,6 +28,7 @@ export default class HostingMultisiteGitAssociationController {
     this.HostingMultisiteGitAssociationService = HostingMultisiteGitAssociationService;
     this.coreURLBuilder = coreURLBuilder;
     this.$translate = $translate;
+    this.atInternet = atInternet;
     const { ovhSubsidiary } = coreConfig.getUser();
     this.GIT_ASSOCIATION_GUIDE_LINK =
       GIT_ASSOCIATION_GUIDE_LINK[ovhSubsidiary] ||
@@ -56,6 +59,10 @@ export default class HostingMultisiteGitAssociationController {
   }
 
   applyConfiguration() {
+    this.atInternet.trackClick({
+      name: `${TRACKING_MULTISITE_PREFIX}::git-association::confirm`,
+      type: 'action',
+    });
     const promise = this.isConfiguration
       ? this.HostingMultisiteGitAssociationService.putWebsiteAssociated(
           this.serviceName,

packages/manager/apps/web/client/app/hosting/multisite/git-integration/association/git-association.html

@@ -20,25 +20,6 @@
 <p data-translate="hosting_multisite_git_association_configure_description"></p>
 
 <form class="form-inline" name="$ctrl.gitAssociationForm">
-    <div
-        data-ng-if="$ctrl.model.repositoryUrl && !$ctrl.model.repositoryUrl.startsWith('https://')"
-    >
-        <h3 data-translate="hosting_multisite_git_association_ssh_key"></h3>
-        <p
-            data-translate="hosting_multisite_git_association_ssh_key_description"
-        ></p>
-        <div class="row">
-            <oui-field
-                class="col-md-4"
-                data-label="{{ ::'hosting_multisite_git_association_ssh_key' | translate }}"
-            >
-                <oui-clipboard
-                    name="sshKey"
-                    data-model=":: $ctrl.sshKey"
-                ></oui-clipboard>
-            </oui-field>
-        </div>
-    </div>
     <h3 data-translate="hosting_multisite_git_association_configure"></h3>
 
     <oui-message type="info">
@@ -129,6 +110,26 @@ <h3 data-translate="hosting_multisite_git_association_configure"></h3>
         </oui-field>
     </div>
 
+    <div
+        data-ng-if="$ctrl.model.repositoryUrl && !$ctrl.model.repositoryUrl.startsWith('https://')"
+    >
+        <h3 data-translate="hosting_multisite_git_association_ssh_key"></h3>
+        <p
+            data-translate="hosting_multisite_git_association_ssh_key_description"
+        ></p>
+        <div class="row">
+            <oui-field
+                class="col-md-4"
+                data-label="{{ ::'hosting_multisite_git_association_ssh_key' | translate }}"
+            >
+                <oui-clipboard
+                    name="sshKey"
+                    data-model=":: $ctrl.sshKey"
+                ></oui-clipboard>
+            </oui-field>
+        </div>
+    </div>
+
     <h3 data-translate="hosting_multisite_git_association_configure_auto"></h3>
     <p
         data-translate="hosting_multisite_git_association_webhook_description"

packages/manager/apps/web/client/app/hosting/multisite/git-integration/deployment/git-deployment.controller.js

@@ -1,15 +1,19 @@
+import { TRACKING_MULTISITE_PREFIX } from '../git-integration.constants';
+
 export default class HostingMultisiteGitDeploymentController {
   /* @ngInject */
   constructor(
     HostingMultisiteGitDeploymentService,
     HostingDomain,
     coreURLBuilder,
     $translate,
+    atInternet,
   ) {
     this.HostingMultisiteGitDeploymentService = HostingMultisiteGitDeploymentService;
     this.HostingDomain = HostingDomain;
     this.coreURLBuilder = coreURLBuilder;
     this.$translate = $translate;
+    this.atInternet = atInternet;
     this.gitForcePush = false;
   }
 
@@ -25,6 +29,10 @@ export default class HostingMultisiteGitDeploymentController {
   }
 
   deployment() {
+    this.atInternet.trackClick({
+      name: `${TRACKING_MULTISITE_PREFIX}::git-deployment::confirm`,
+      type: 'action',
+    });
     this.isDeploying = true;
     this.HostingMultisiteGitDeploymentService.postWebsiteDeploy(
       this.serviceName,

packages/manager/apps/web/client/app/hosting/multisite/git-integration/git-integration.constants.js

@@ -0,0 +1,5 @@
+export const TRACKING_MULTISITE_PREFIX = 'web::hosting::dashboard::multisite';
+
+export default {
+  TRACKING_MULTISITE_PREFIX,
+};

packages/manager/apps/web/client/app/hosting/multisite/git-integration/removal/git-removal.controller.js

@@ -1,8 +1,16 @@
+import { TRACKING_MULTISITE_PREFIX } from '../git-integration.constants';
+
 export default class HostingMultisiteGitDeploymentController {
   /* @ngInject */
-  constructor($translate, HostingDomain, HostingMultisiteGitRemovalService) {
+  constructor(
+    $translate,
+    atInternet,
+    HostingDomain,
+    HostingMultisiteGitRemovalService,
+  ) {
     this.isConfirmationStep = false;
     this.$translate = $translate;
+    this.atInternet = atInternet;
     this.HostingMultisiteGitRemovalService = HostingMultisiteGitRemovalService;
     this.HostingDomain = HostingDomain;
   }
@@ -22,6 +30,10 @@ export default class HostingMultisiteGitDeploymentController {
   }
 
   deleteGitAssociation(deleteFiles) {
+    this.atInternet.trackClick({
+      name: `${TRACKING_MULTISITE_PREFIX}::git-removal::confirm`,
+      type: 'action',
+    });
     this.isDeleting = true;
     this.HostingDomain.getWebsitesAssociated(this.serviceName, this.path)
       .then(([websiteId]) => {

packages/manager/apps/web/client/app/hosting/multisite/hosting-multisite.controller.js

@@ -20,6 +20,7 @@ import {
   HOSTING_TAB_DOMAINS,
   RECORD_TYPE_TO_IP_TYPE,
 } from './hosting-multisite.constants';
+import { TRACKING_MULTISITE_PREFIX } from './git-integration/git-integration.constants';
 
 const CDN_STATISTICS_PERIOD = {
   DAY: 'day',
@@ -443,26 +444,42 @@ angular
         $scope.setAction('multisite/update/hosting-multisite-update', domain);
       };
 
-      $scope.goToRemoveRepository = (domain) =>
+      $scope.goToRemoveRepository = (domain) => {
+        sendTrackClick(`${TRACKING_MULTISITE_PREFIX}::git-removal`);
         $scope.$resolve.goToRemoveRepository(
           $scope.hosting.serviceName,
           domain.path,
         );
+      };
 
-      $scope.goToAssociateRepository = (domain) =>
+      $scope.goToAssociateRepository = (domain) => {
+        sendTrackClick(`${TRACKING_MULTISITE_PREFIX}::add-git`);
         $scope.$resolve.goToAssociateRepository(
           $scope.hosting.serviceName,
           domain,
         );
+      };
 
       $scope.goToConfigureGit = (domain) =>
         $scope.$resolve.goToConfigureGit($scope.hosting.serviceName, domain);
 
-      $scope.goToDeployWebSite = (domain) =>
-        $scope.$resolve.goToDeployWebSite($scope.hosting.serviceName, domain);
+      $scope.goToDeployWebSite = (domain) => {
+        sendTrackClick(`${TRACKING_MULTISITE_PREFIX}::git-deployment`);
+        return $scope.$resolve.goToDeployWebSite(
+          $scope.hosting.serviceName,
+          domain,
+        );
+      };
 
-      $scope.goToViewLastDeploy = (domain) =>
-        $scope.$resolve.goToViewLastDeploy($scope.hosting.serviceName, domain);
+      $scope.goToViewLastDeploy = (domain) => {
+        sendTrackClick(
+          `${TRACKING_MULTISITE_PREFIX}::git-view-last-deployment`,
+        );
+        return $scope.$resolve.goToViewLastDeploy(
+          $scope.hosting.serviceName,
+          domain,
+        );
+      };
 
       $scope.restartDomain = (domain) =>
         HostingDomain.restartVirtualHostOfAttachedDomain(