Merge pull request #1385 from ovh-ux/develop

Develop
ovh-ux · Sep 11, 2019 · 106318b · 106318b
2 parents 2151675 + 32635dc
commit 106318b
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 30 deletions.
diff --git a/client/app/app.js b/client/app/app.js
@@ -17,6 +17,7 @@ import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
 import ngUirouterLineProgress from '@ovh-ux/ng-ui-router-line-progress';
 import ovhContacts from '@ovh-ux/ng-ovh-contacts';
 import ovhManagerCore from '@ovh-ux/manager-core';
+import ovhManagerBanner from '@ovh-ux/manager-banner';
 import ovhManagerNavbar from '@ovh-ux/manager-navbar';
 import ovhManagerServerSidebar from '@ovh-ux/manager-server-sidebar';
 import ovhPaymentMethod from '@ovh-ux/ng-ovh-payment-method';
@@ -84,6 +85,7 @@ angular
     'ovh-utils-angular',
     'ovhBrowserAlert',
     ovhContacts,
+    ovhManagerBanner,
     ovhManagerNavbar,
     ovhPaymentMethod,
     'pascalprecht.translate',

diff --git a/client/app/billing/autoRenew/autorenew.constants.js b/client/app/billing/autoRenew/autorenew.constants.js
@@ -51,6 +51,8 @@ export const SERVICE_STATUS = {
   RESILIATED: 'expired',
 };
 
+export const URL_PARAMETER_SEPARATOR = '%20';
+
 export default {
   AUTORENEW_EVENT,
   CONTRACTS_IDS,
@@ -60,4 +62,5 @@ export default {
   RENEW_URL,
   SERVICE_EXPIRATION,
   SERVICE_STATUS,
+  URL_PARAMETER_SEPARATOR,
 };
diff --git a/client/app/billing/autoRenew/autorenew.controller.js b/client/app/billing/autoRenew/autorenew.controller.js
@@ -1,4 +1,4 @@
-import { NIC_ALL } from './autorenew.constants';
+import { NIC_ALL, RENEW_URL, URL_PARAMETER_SEPARATOR } from './autorenew.constants';
 
 export default class AutorenewCtrl {
   /* @ngInject */
@@ -106,6 +106,7 @@ export default class AutorenewCtrl {
 
   onRowSelection($rows) {
     this.selectedServices = $rows;
+    this.manualRenewUrl = this.getManualRenewUrl();
   }
 
   trackCSVExport() {
@@ -188,4 +189,12 @@ export default class AutorenewCtrl {
         this.nicRenewLoading = false;
       });
   }
+
+  getManualRenewUrl() {
+    const urlParameterDomains = this.selectedServices
+      .map(({ domain }) => domain)
+      .join(URL_PARAMETER_SEPARATOR);
+
+    return `${RENEW_URL[this.currentUser.ovhSubsidiary]}${urlParameterDomains}`;
+  }
 }
diff --git a/client/app/billing/autoRenew/autorenew.html b/client/app/billing/autoRenew/autorenew.html
@@ -98,6 +98,10 @@
             <extra-top>
                 <oui-action-menu data-text="{{:: 'autorenew_service_action_title' | translate }}">
                     <div data-ng-if="$ctrl.selectedServices.length > 0">
+                        <oui-action-menu-item data-href="{{ $ctrl.manualRenewUrl }}"
+                                              data-external>
+                            <span data-translate="billing_autorenew_renew_action"></span>
+                        </oui-action-menu-item>
                         <oui-action-menu-item
                             data-on-click="$ctrl.disableBulkAutorenew($ctrl.selectedServices)">
                             <span data-translate="billing_autorenew_service_disable_autorenew"></span>
@@ -106,7 +110,7 @@
                             data-on-click="$ctrl.enableBulkAutorenew($ctrl.selectedServices)">
                             <span data-translate="billing_autorenew_service_enable_autorenew"></span>
                         </oui-action-menu-item>
-                        <oui-action-menu-divider ></oui-action-menu-divider>
+                        <oui-action-menu-divider></oui-action-menu-divider>
                     </div>
                     <button type="button"
                         class="oui-dropdown-option"
@@ -165,7 +169,8 @@
                 data-property="status"
                 data-type="options"
                 data-type-options="$ctrl.filtersOptions.status"
-                data-filterable>
+                data-filterable
+>
                 <span class="oui-status oui-status_error"
                     data-ng-if="$row.hasDebt()"
                     data-translate="billing_autorenew_service_status_pending_debt">
@@ -180,7 +185,8 @@
                 data-property="expiration"
                 data-type="options"
                 data-type-options="$ctrl.filtersOptions.expiration"
-                data-filterable>
+                data-filterable
+                data-sortable>
                 <span data-ng-if="$row.isOneShot()">-</span>
                 <span
                     data-ng-if="$row.hasManualRenew() && !$row.isResiliated() || $row.hasDebt()"

diff --git a/client/app/billing/autoRenew/translations/Messages_fr_FR.json b/client/app/billing/autoRenew/translations/Messages_fr_FR.json
@@ -136,6 +136,7 @@
   "billing_autorenew_service_type_cloud_project": "Projet Cloud",
   "billing_export_csv": "Exporter en CSV",
   "billing_common_link_new_window": "(nouvelle fenêtre)",
+  "billing_autorenew_renew_action": "Renouveler",
 
   "billing_autorenew_service_renew_requires_mean_and_date": "Afin de finaliser l'activation du renouvellement automatique, veuillez ajouter un moyen de paiement et ensuite il vous sera possible de sélectionner votre date de prélèvement.",
   "billing_autorenew_service_activate_alert": "Vous avez au moins un service en renouvellement automatique mais vous n'avez pas encore autorisé cette option."

diff --git a/client/app/configuration/configuration.html b/client/app/configuration/configuration.html
@@ -1,5 +1,7 @@
 <div class="container-fluid">
-    <div class="text-center mt-5 py-5">
+    <div class="text-center py-5">
+        <ovh-manager-banner class="d-block mb-4"></ovh-manager-banner>
+
         <h1 class="d-inline">
             <span data-translate="welcome_to_your_manager_1"></span>
             <span data-translate="welcome_to_your_manager_2"></span>

diff --git a/package.json b/package.json
@@ -39,14 +39,15 @@
     "@bower_components/angular-ui-utils": "angular-ui/ui-utils#~0.2.3",
     "@bower_components/bootstrap4": "twbs/bootstrap#v4.0.0",
     "@bower_components/ng-ckeditor": "esvit/ng-ckeditor#^0.2.1",
+    "@ovh-ux/manager-banner": "^1.1.0",
     "@ovh-ux/manager-config": "^0.3.0",
     "@ovh-ux/manager-core": "^7.1.2",
     "@ovh-ux/manager-navbar": "^1.2.2",
-    "@ovh-ux/manager-server-sidebar": "^0.5.0",
+    "@ovh-ux/manager-server-sidebar": "^0.5.2",
     "@ovh-ux/ng-at-internet": "^4.0.0",
     "@ovh-ux/ng-at-internet-ui-router-plugin": "^2.0.0",
     "@ovh-ux/ng-ovh-actions-menu": "^5.0.0",
-    "@ovh-ux/ng-ovh-api-wrappers": "^4.0.2",
+    "@ovh-ux/ng-ovh-api-wrappers": "^4.0.4",
     "@ovh-ux/ng-ovh-chatbot": "^2.0.1",
     "@ovh-ux/ng-ovh-cloud-universe-components": "^1.3.1",
     "@ovh-ux/ng-ovh-contacts": "^1.0.1",
@@ -122,11 +123,11 @@
     "ovh-angular-responsive-tabs": "^4.0.0",
     "ovh-angular-tail-logs": "^1.1.1",
     "ovh-angular-toaster": "^0.8.0",
-    "ovh-api-services": "^9.5.0",
+    "ovh-api-services": "^9.8.0",
     "ovh-jquery-ui-draggable-ng": "^0.0.5",
     "ovh-manager-webfont": "^1.2.0",
     "ovh-module-exchange": "^9.4.7",
-    "ovh-ui-angular": "^3.7.4",
+    "ovh-ui-angular": "^3.7.6",
     "ovh-ui-kit": "^2.33.4",
     "ovh-ui-kit-bs": "~1.3.x",
     "punycode": "^1.2.4",

diff --git a/yarn.lock b/yarn.lock
@@ -896,6 +896,13 @@
     rollup-pluginutils "^2.3.3"
     slash "^2.0.0"
 
+"@ovh-ux/manager-banner@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@ovh-ux/manager-banner/-/manager-banner-1.1.0.tgz#8b85ce7dee2c73208de045136cd06eb76fb41cf7"
+  integrity sha512-z3HEaoZrr9RnQCpm9hTCca7eiN5ABEqnDhvQXcUoXUf9czXTdD6zwrU1KCqnQ0pRIqpaJnhR5O2cZmdPRRJN9w==
+  dependencies:
+    lodash "^4.17.15"
+
 "@ovh-ux/manager-config@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@ovh-ux/manager-config/-/manager-config-0.3.0.tgz#d3c444090ad42af74029184d0dcf4ca2c99f9f8d"
@@ -917,13 +924,13 @@
     lodash "^4.17.14"
     moment "^2.24.0"
 
-"@ovh-ux/manager-server-sidebar@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@ovh-ux/manager-server-sidebar/-/manager-server-sidebar-0.5.0.tgz#45600c210fb2a973ac96543451bf5c086ee0cbbc"
-  integrity sha512-isqSAjfPleKc7qFYzlXGFgCR85blbEmQ6fxWKFzSfONzMGer/2tQIhP/CX//DzRpzo+BavnVmPzrU4+aFhEKug==
+"@ovh-ux/manager-server-sidebar@^0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@ovh-ux/manager-server-sidebar/-/manager-server-sidebar-0.5.2.tgz#6e2b7e135ccaf17a39daade7b88d388936d3361f"
+  integrity sha512-fR+Be8VgvgMMXMEciVpnRzNTnZKgjZeU6vbb8kvJWIQiE8xWd17dplc6CkpneljCec/zoINm6NaaeGnb7Q9rXw==
   dependencies:
     jsurl "^0.1.5"
-    lodash "^4.17.14"
+    lodash "^4.17.15"
 
 "@ovh-ux/manager-webpack-config@^3.0.0":
   version "3.0.0"
@@ -1000,12 +1007,12 @@
   dependencies:
     lodash "^4.17.11"
 
-"@ovh-ux/ng-ovh-api-wrappers@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@ovh-ux/ng-ovh-api-wrappers/-/ng-ovh-api-wrappers-4.0.2.tgz#4d91cac4c622436f5359715dde31e1d6d75e2f5c"
-  integrity sha512-zNv2pQMyDRAVUOLvsRqV+6xG8NTz9LjWlSmvMXQ+sVjo9fZkEFxOS+mAGWgGweQjwrM+2Rd1t0Xj45hlhN/sQw==
+"@ovh-ux/ng-ovh-api-wrappers@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@ovh-ux/ng-ovh-api-wrappers/-/ng-ovh-api-wrappers-4.0.4.tgz#0fd5f6b7b428bb08e7c37d6bc98f43dfbda50ef9"
+  integrity sha512-ckPKAzXRuFkJ27QZ16AtiTgFZ8T5yTr6rkPqJetqGA8f2ncqBBnmnHtZGdoBFdk445dnrLyXsXjLuG0kTwSiRw==
   dependencies:
-    lodash "^4.17.11"
+    lodash "^4.17.15"
 
 "@ovh-ux/ng-ovh-chatbot@^2.0.1":
   version "2.0.1"
@@ -4857,9 +4864,9 @@ forever-agent@~0.6.1:
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@^2.3.1:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.0.tgz#094ec359dc4b55e7d62e0db4acd76e89fe874d37"
-  integrity sha512-WXieX3G/8side6VIqx44ablyULoGruSde5PNTxoUyo5CeyAMX6nVWUd0rgist/EuX655cjhUhTo1Fo3tRYqbcA==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.6"
@@ -8135,10 +8142,10 @@ ovh-angular-toaster@^0.8.0:
   resolved "https://registry.yarnpkg.com/ovh-angular-toaster/-/ovh-angular-toaster-0.8.0.tgz#7073201379ea196c721d583421c0cef1d04bdbdb"
   integrity sha1-cHMgE3nqGWxyHVg0IcDO8dBL29s=
 
-ovh-api-services@^9.5.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/ovh-api-services/-/ovh-api-services-9.5.0.tgz#09640d4bae41c822a23946577642cbd0faa7cf4d"
-  integrity sha512-x34ApZe0+HT7tw1qTVQnFG24GX7CUKU2jSnaoVQBxOWlULN2yrgP2//I4Yw+4NiulZnKEeLNyVlK2mm8TZQR0Q==
+ovh-api-services@^9.8.0:
+  version "9.8.0"
+  resolved "https://registry.yarnpkg.com/ovh-api-services/-/ovh-api-services-9.8.0.tgz#9764da1793ba3bd01bf897c2be6298a9de6cc2cb"
+  integrity sha512-WI9TfBkxkR5TZvQU1Xx8NIRwpS3TVqa7gQwRye+3Wj+b2UIGKAOmf0/fjGTsXSQBPsnMo3U4P+9YmjSO0OX5/A==
   dependencies:
     lodash "^4.17.15"
 
@@ -8160,10 +8167,10 @@ ovh-module-exchange@^9.4.7:
     filesize "^3.6.1"
     lodash "~3.9.3"
 
-ovh-ui-angular@^3.7.4:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/ovh-ui-angular/-/ovh-ui-angular-3.7.4.tgz#fa211e2a4445c83fcf973ad596637be859a67d13"
-  integrity sha512-b6a0G4F1seoivqTY9sczjF8P2DlqZcqCdCSxFl6cq4HGVDqGcTZ/Su5gRGOsBP4CmmuvXjCsS7Veno8fPqISkw==
+ovh-ui-angular@^3.7.6:
+  version "3.7.6"
+  resolved "https://registry.yarnpkg.com/ovh-ui-angular/-/ovh-ui-angular-3.7.6.tgz#542636e472426a1db07cbb4392d86d08e0c00e2f"
+  integrity sha512-Nq+BfbztNUB5cldCEDGazTS2lgtK21HUREkyZKlUxnyVW4DX2+MIUplABXrd1XXhv+cSCrTxgbSQz+Y8rMGCqw==
   dependencies:
     bloodhound-js "^1.2.3"
     clipboard "^2.0.1"