sync: master to develop

ovh · Sep 3, 2024 · 0faa25b · 0faa25b
2 parents e8bb043 + 7ba3a0b
commit 0faa25b
Show file tree

Hide file tree

Showing 87 changed files with 495 additions and 207 deletions.
diff --git a/packages/components/ng-log-live-tail/src/index.less b/packages/components/ng-log-live-tail/src/index.less
@@ -115,6 +115,10 @@
   max-height: 70vh;
 }
 
+.overflow-auto {
+  overflow: auto;
+}
+
 @keyframes tail-logs-blink {
   0% {
     opacity: 1;

diff --git a/...ted/client/app/components/dedicated-cloud/dashboard/dedicatedCloud-dashboard.component.js b/...ted/client/app/components/dedicated-cloud/dashboard/dedicatedCloud-dashboard.component.js
@@ -34,6 +34,7 @@ export default {
     setMessage: '<',
     trackingPrefix: '<',
     dedicatedCloudDescription: '<',
+    managedVCDAvailability: '<',
   },
   template,
 };
diff --git a/...s/dedicated/client/app/components/dedicated-cloud/dashboard/dedicatedCloud-dashboard.html b/...s/dedicated/client/app/components/dedicated-cloud/dashboard/dedicatedCloud-dashboard.html
@@ -78,7 +78,7 @@
                 data-on-terminate="$ctrl.onTerminate()"
             ></ovh-manager-pcc-dashboard-service-management>
             <ovh-manager-pcc-dashboard-vmware-cloud-director
-                data-ng-if="$ctrl.dedicatedCloudDescription.canMigrateToVCD"
+                data-ng-if="$ctrl.managedVCDAvailability"
                 data-go-to-vcd-order="$ctrl.goToVcdOrder"
                 data-product-id="$ctrl.productId"
             ></ovh-manager-pcc-dashboard-vmware-cloud-director>

diff --git a/...client/app/components/dedicated-cloud/dashboard/tiles/vmware-cloud-director/controller.js b/...client/app/components/dedicated-cloud/dashboard/tiles/vmware-cloud-director/controller.js
@@ -1,33 +1,24 @@
 export default class {
   /* @ngInject */
-  constructor($translate, DedicatedCloud, coreURLBuilder) {
+  constructor($translate, DedicatedCloud) {
     this.$translate = $translate;
     this.DedicatedCloud = DedicatedCloud;
-    this.coreURLBuilder = coreURLBuilder;
   }
 
   $onInit() {
-    this.isSubscribed = false;
-    this.guideLink = this.DedicatedCloud.getVCDGuideLink();
-    this.messageLink = this.coreURLBuilder.buildURL(
-      'dedicated',
-      '#/useraccount/emails',
-    );
-    this.checkSubscription();
+    this.guideLinks = this.DedicatedCloud.getVCDGuideLinks();
+    this.checkMigration();
   }
 
-  checkSubscription() {
+  checkMigration() {
     this.loading = true;
-    return this.DedicatedCloud.hasSubscribedVCDOffer(this.productId)
-      .then((isSubscribed) => {
-        this.isSubscribed = isSubscribed;
-        this.subscriptionLabel = this.$translate.instant(
-          isSubscribed
-            ? 'dedicatedCloud_vmware_cloud_director_subscribed'
-            : 'dedicatedCloud_vmware_cloud_director_not_subscribed',
-          {
-            link: this.guideLink,
-          },
+    return this.DedicatedCloud.getManagedVCDMigrationState(this.productId)
+      .then((state) => {
+        this.vcdMigrationState = state;
+        this.migrationTitle = this.$translate.instant(
+          this.vcdMigrationState.isDone
+            ? 'dedicatedCloud_vmware_cloud_director_migration'
+            : 'dedicatedCloud_vmware_cloud_director_validate_migration',
         );
       })
       .finally(() => {

diff --git a/...client/app/components/dedicated-cloud/dashboard/tiles/vmware-cloud-director/template.html b/...client/app/components/dedicated-cloud/dashboard/tiles/vmware-cloud-director/template.html
@@ -1,7 +1,10 @@
 <div class="row text-center" data-ng-if="$ctrl.loading">
     <oui-spinner data-size="s"></oui-spinner>
 </div>
-<div class="oui-tile mt-3" data-ng-if="!$ctrl.loading">
+<div
+    class="oui-tile mt-3"
+    data-ng-if="!$ctrl.loading && $ctrl.vcdMigrationState.isAllowed"
+>
     <h4 class="oui-tile__title oui-heading_4">
         <span
             data-translate="dedicatedCloud_vmware_cloud_director_title"
@@ -13,53 +16,55 @@ <h4 class="oui-tile__title oui-heading_4">
         </span>
     </h4>
 
-    <oui-tile-definition
-        data-term="{{:: 'dedicatedCloud_vmware_cloud_director_subscription' | translate }}"
-    >
-        <oui-tile-description>
-            <p data-ng-bind-html=":: $ctrl.subscriptionLabel"></p>
+    <oui-tile-definition data-term="{{:: $ctrl.migrationTitle }}">
+        <oui-tile-description data-ng-if=":: $ctrl.vcdMigrationState.isDone">
             <span
-                data-ng-if="$ctrl.isSubscribed"
                 class="oui-badge oui-badge_success"
-                data-translate="dedicatedCloud_vmware_cloud_director_subscribed_status"
+                data-translate="dedicatedCloud_vmware_cloud_director_migration_confirmed"
             >
             </span>
+            <p
+                class="pt-1"
+                data-translate="dedicatedCloud_vmware_cloud_director_migration_confirmed_detail"
+            ></p>
         </oui-tile-description>
-
-        <oui-action-menu
-            data-compact
-            data-placement="end"
-            data-ng-if=":: !$ctrl.isSubscribed"
-        >
-            <oui-action-menu-item data-on-click="$ctrl.goToVcdOrder()">
+        <oui-tile-description data-ng-if=":: !$ctrl.vcdMigrationState.isDone">
+            <p
+                data-translate="dedicatedCloud_vmware_cloud_director_validate_migration_detail"
+            ></p>
+            <oui-button
+                data-variant="primary"
+                data-on-click="$ctrl.goToVcdOrder()"
+            >
                 <span
-                    data-translate="dedicatedCloud_vmware_cloud_director_order"
+                    data-translate="dedicatedCloud_vmware_cloud_director_validate"
                 ></span>
-            </oui-action-menu-item>
-        </oui-action-menu>
+            </oui-button>
+        </oui-tile-description>
     </oui-tile-definition>
 
     <oui-tile-definition
         data-term="{{:: 'dedicatedCloud_vmware_cloud_director_useful_links' | translate }}"
     >
-        <oui-tile-description>
+        <oui-tile-description data-ng-if=":: $ctrl.vcdMigrationState.isDone">
             <a
-                data-ng-href="{{ :: $ctrl.messageLink}}"
+                data-ng-href="{{ :: $ctrl.guideLinks.MIGRATION}}"
                 target="_blank"
                 rel="nooponer"
             >
                 <span
-                    data-translate="dedicatedCloud_vmware_cloud_director_announcement_message"
+                    data-translate="dedicatedCloud_vmware_cloud_director_migration_documentation"
                 >
                 </span>
                 <i
                     class="pl-1 oui-icon oui-icon-external-link"
                     aria-hidden="true"
                 ></i>
             </a>
-            <br />
+        </oui-tile-description>
+        <oui-tile-description data-ng-if=":: !$ctrl.vcdMigrationState.isDone">
             <a
-                data-ng-href="{{ :: $ctrl.guideLink}}"
+                data-ng-href="{{ :: $ctrl.guideLinks.OFFER}}"
                 target="_blank"
                 rel="nooponer"
             >
@@ -72,6 +77,22 @@ <h4 class="oui-tile__title oui-heading_4">
                     aria-hidden="true"
                 ></i>
             </a>
+            <br />
+            <a
+                data-ng-href="{{ :: $ctrl.guideLinks.TERMS}}"
+                target="_blank"
+                rel="nooponer"
+            >
+                <span
+                    data-translate="dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions"
+                >
+                </span>
+                <i
+                    class="pl-1 oui-icon oui-icon-external-link"
+                    aria-hidden="true"
+                ></i>
+            </a>
+            <br />
         </oui-tile-description>
     </oui-tile-definition>
 </div>
diff --git a/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_de_DE.json b/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_de_DE.json
@@ -1,5 +1,5 @@
 {
-  "dedicatedCloud_vmware_cloud_director_title": "Migration zu VCD",
+  "dedicatedCloud_vmware_cloud_director_title": "Migration zum Managed VCD Angebot",
   "dedicatedCloud_vmware_cloud_director_offer_detail": "Beschreibung des VCD-Angebots",
   "dedicatedCloud_vmware_cloud_director_new": "Neu",
   "dedicatedCloud_vmware_cloud_director_subscription": "Abonnement",
@@ -8,5 +8,13 @@
   "dedicatedCloud_vmware_cloud_director_subscribed_status": "Abonniert",
   "dedicatedCloud_vmware_cloud_director_subscribed": "Sie haben die Migration zu <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a> abonniert.",
   "dedicatedCloud_vmware_cloud_director_not_subscribed": "Abonnement der Migration zu <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a> vor dem 30. April 2024 inklusive.",
-  "dedicatedCloud_vmware_cloud_director_order": "Das VCD-Angebot abonnieren"
+  "dedicatedCloud_vmware_cloud_director_order": "Das VCD-Angebot abonnieren",
+  "dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Besondere Vertragsbedingungen des Dienstes",
+  "dedicatedCloud_vmware_cloud_director_migration": "Migration",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migration bestätigt",
+  "dedicatedCloud_vmware_cloud_director_validate_migration": "Die Migration bestätigen",
+  "dedicatedCloud_vmware_cloud_director_migration_documentation": "Dokumentation – Migrationsprozess",
+  "dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Bestätigen Sie die Migration Ihres Dienstes zu Managed VCD on OVHcloud und akzeptieren Sie die besonderen Vertragsbedingungen des Dienstes.",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "Die Migration Ihres Dienstes zum Managed VCD Angebot wurde registriert. Unsere Teams werden Sie bezüglich der Planung und der Modalitäten des Vorgangs kontaktieren.",
+  "dedicatedCloud_vmware_cloud_director_validate": "Bestätigen"
 }
diff --git a/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_en_GB.json b/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_en_GB.json
@@ -1,5 +1,5 @@
 {
-  "dedicatedCloud_vmware_cloud_director_title": "Migrating to VCD",
+  "dedicatedCloud_vmware_cloud_director_title": "Migrating to the Managed VCD solution",
   "dedicatedCloud_vmware_cloud_director_offer_detail": "VCD solution description",
   "dedicatedCloud_vmware_cloud_director_new": "New",
   "dedicatedCloud_vmware_cloud_director_subscription": "Subscription",
@@ -8,5 +8,13 @@
   "dedicatedCloud_vmware_cloud_director_subscribed_status": "Subscribed",
   "dedicatedCloud_vmware_cloud_director_subscribed": "You have signed up to migrate to <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a>",
   "dedicatedCloud_vmware_cloud_director_not_subscribed": "Subscription to the <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a> before 30 April 2024 included.",
-  "dedicatedCloud_vmware_cloud_director_order": "Subscribe to VCD"
+  "dedicatedCloud_vmware_cloud_director_order": "Subscribe to VCD",
+  "dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Special Terms and Conditions of Service",
+  "dedicatedCloud_vmware_cloud_director_migration": "Migration",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migration confirmed",
+  "dedicatedCloud_vmware_cloud_director_validate_migration": "Confirm migration",
+  "dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentation - Migration process",
+  "dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Confirm the migration of your service to the Managed VCD on OVHcloud solution, and accept its Special Terms and Conditions of Service.",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "Your service has been migrated to the Managed VCD solution. Our teams will get back to you regarding the schedule and details of the migration",
+  "dedicatedCloud_vmware_cloud_director_validate": "Confirm"
 }
diff --git a/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_es_ES.json b/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_es_ES.json
@@ -1,5 +1,5 @@
 {
-  "dedicatedCloud_vmware_cloud_director_title": "Migración a VCD",
+  "dedicatedCloud_vmware_cloud_director_title": "Migración a la solución Managed VCD",
   "dedicatedCloud_vmware_cloud_director_offer_detail": "Descripción de la solución VCD",
   "dedicatedCloud_vmware_cloud_director_new": "Nuevo",
   "dedicatedCloud_vmware_cloud_director_subscription": "Contratación",
@@ -8,5 +8,13 @@
   "dedicatedCloud_vmware_cloud_director_subscribed_status": "Contratado",
   "dedicatedCloud_vmware_cloud_director_subscribed": "Ha contratado la migración a la solución <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a>",
   "dedicatedCloud_vmware_cloud_director_not_subscribed": "Contratación de la migración a la solución <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a> antes del 30 de abril de 2024 incluido.",
-  "dedicatedCloud_vmware_cloud_director_order": "Contratar la solución VCD"
+  "dedicatedCloud_vmware_cloud_director_order": "Contratar la solución VCD",
+  "dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Condiciones Particulares del Servicio",
+  "dedicatedCloud_vmware_cloud_director_migration": "Migración",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migración confirmada",
+  "dedicatedCloud_vmware_cloud_director_validate_migration": "Confirmar la migración",
+  "dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentación - Proceso de migración",
+  "dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Por favor, confirme la migración de su servicio a la solución Managed VCD on OVHcloud y acepte las Condiciones Particulares del Servicio.",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La migración del servicio a la solución Managed VCD se ha realizado correctamente. Nuestros equipos se pondrán en contacto con usted en relación con la planificación y las modalidades de esta operación.",
+  "dedicatedCloud_vmware_cloud_director_validate": "Confirmar"
 }
diff --git a/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_fr_CA.json b/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_fr_CA.json
@@ -1,12 +1,14 @@
 {
-  "dedicatedCloud_vmware_cloud_director_title": "Migration vers VCD",
+  "dedicatedCloud_vmware_cloud_director_title": "Migration vers l'offre Managed VCD",
   "dedicatedCloud_vmware_cloud_director_offer_detail": "Descriptif de l'offre VCD",
+  "dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Conditions particulières du service",
   "dedicatedCloud_vmware_cloud_director_new": "New",
-  "dedicatedCloud_vmware_cloud_director_subscription": "Souscription",
-  "dedicatedCloud_vmware_cloud_director_announcement_message": "Message d'annonce",
+  "dedicatedCloud_vmware_cloud_director_migration": "Migration",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migration confirmée",
+  "dedicatedCloud_vmware_cloud_director_validate_migration": "Valider la migration",
+  "dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentation - Process de migration",
   "dedicatedCloud_vmware_cloud_director_useful_links": "Liens utiles",
-  "dedicatedCloud_vmware_cloud_director_subscribed_status": "Souscrit",
-  "dedicatedCloud_vmware_cloud_director_subscribed": "Vous avez souscrit à la migration vers l'offre <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a>",
-  "dedicatedCloud_vmware_cloud_director_not_subscribed": "Souscription à la migration vers l'offre <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a> avant le 30 avril 2024 inclus.",
-  "dedicatedCloud_vmware_cloud_director_order": "Souscrire à l'offre VCD"
+  "dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Validez la migration de votre service vers l'offre Managed VCD on OVHcloud et acceptez les conditions particulières du service.",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La migration de votre service vers l'offre Managed VCD est bien prise en compte. Nos équipes reviendront vers vous concernant la planification et les modalités de l'opération.",
+  "dedicatedCloud_vmware_cloud_director_validate": "Valider"
 }
diff --git a/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_fr_FR.json b/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_fr_FR.json
@@ -1,12 +1,14 @@
 {
-  "dedicatedCloud_vmware_cloud_director_title": "Migration vers VCD",
+  "dedicatedCloud_vmware_cloud_director_title": "Migration vers l'offre Managed VCD",
   "dedicatedCloud_vmware_cloud_director_offer_detail": "Descriptif de l'offre VCD",
+  "dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Conditions particulières du service",
   "dedicatedCloud_vmware_cloud_director_new": "New",
-  "dedicatedCloud_vmware_cloud_director_subscription": "Souscription",
-  "dedicatedCloud_vmware_cloud_director_announcement_message": "Message d'annonce",
+  "dedicatedCloud_vmware_cloud_director_migration": "Migration",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migration confirmée",
+  "dedicatedCloud_vmware_cloud_director_validate_migration": "Valider la migration",
+  "dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentation - Process de migration",
   "dedicatedCloud_vmware_cloud_director_useful_links": "Liens utiles",
-  "dedicatedCloud_vmware_cloud_director_subscribed_status": "Souscrit",
-  "dedicatedCloud_vmware_cloud_director_subscribed": "Vous avez souscrit à la migration vers l'offre <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a>",
-  "dedicatedCloud_vmware_cloud_director_not_subscribed": "Souscription à la migration vers l'offre <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a> avant le 30 avril 2024 inclus.",
-  "dedicatedCloud_vmware_cloud_director_order": "Souscrire à l'offre VCD"
+  "dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Validez la migration de votre service vers l'offre Managed VCD on OVHcloud et acceptez les conditions particulières du service.",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La migration de votre service vers l'offre Managed VCD est bien prise en compte. Nos équipes reviendront vers vous concernant la planification et les modalités de l'opération.",
+  "dedicatedCloud_vmware_cloud_director_validate": "Valider"
 }
diff --git a/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_it_IT.json b/...ts/dedicated-cloud/dashboard/tiles/vmware-cloud-director/translations/Messages_it_IT.json
@@ -1,5 +1,5 @@
 {
-  "dedicatedCloud_vmware_cloud_director_title": "Migrazione verso VCD",
+  "dedicatedCloud_vmware_cloud_director_title": "Migrazione alla soluzione Managed VCD",
   "dedicatedCloud_vmware_cloud_director_offer_detail": "Descrizione dell'offerta VCD",
   "dedicatedCloud_vmware_cloud_director_new": "Nuovo",
   "dedicatedCloud_vmware_cloud_director_subscription": "Abbonamento",
@@ -8,5 +8,13 @@
   "dedicatedCloud_vmware_cloud_director_subscribed_status": "Sottoscritto",
   "dedicatedCloud_vmware_cloud_director_subscribed": "Hai sottoscritto la migrazione verso la soluzione <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a>",
   "dedicatedCloud_vmware_cloud_director_not_subscribed": "Sottoscrizione alla migrazione verso il servizio <a href=\"{{link}}\" target=\"_blank\" rel=\"noopener\">VMware Cloud Director (VCD)</a> entro il 30 aprile 2024 compreso.",
-  "dedicatedCloud_vmware_cloud_director_order": "Sottoscrivere la soluzione VCD"
+  "dedicatedCloud_vmware_cloud_director_order": "Sottoscrivere la soluzione VCD",
+  "dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Condizioni Particolari del Servizio",
+  "dedicatedCloud_vmware_cloud_director_migration": "Migrazione",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migrazione confermata",
+  "dedicatedCloud_vmware_cloud_director_validate_migration": "Confermare la migrazione",
+  "dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentazione - Processo di migrazione",
+  "dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Conferma la migrazione del tuo servizio verso la soluzione Managed VCD on OVHcloud e accetta le Condizioni Particolari del Servizio.",
+  "dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La migrazione del tuo servizio verso la soluzione Managed VCD è stata presa in carico. I nostri team ti informeranno sulla pianificazione e le modalità dell'operazione.",
+  "dedicatedCloud_vmware_cloud_director_validate": "Confermare"
 }