fix(rclone-modal-text): change rclone text (#1128)

varun257 · Joffrey LEVEUGLE · commit af01198718cd · 2019-09-12T16:27:56.000+02:00
diff --git a/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.component.js b/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.component.js
@@ -9,6 +9,7 @@ export default {
     userId: '<',
     user: '<',
     regions: '<',
+    currentRegion: '<',
     openstackGuide: '<',
     goBack: '<',
   },
diff --git a/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.constants.js b/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.constants.js
@@ -5,10 +5,10 @@ export const OPENRC_VERSION = {
 
 export const OPENSTACK_GUIDE = {
   EU: {
-    FR: 'https://www.ovh.com/fr/publiccloud/guides/g1852.charger_les_variables_denvironnement_openstack',
+    FR: 'https://docs.ovh.com/fr/public-cloud/charger-les-variables-denvironnement-openstack/',
   },
   CA: {
-    FR: 'https://www.ovh.com/fr/publiccloud/guides/g1852.charger_les_variables_denvironnement_openstack',
+    FR: 'https://docs.ovh.com/fr/public-cloud/charger-les-variables-denvironnement-openstack/',
   },
   US: {},
 };
diff --git a/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.controller.js b/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.controller.js
@@ -27,12 +27,13 @@ export default class PciUsersDownloadOpenRcController {
       label: this.CucRegionService.getTranslatedMicroRegion(region),
     }));
     this.region = first(this.regions);
+    this.hasGlobalRegions = this.PciProjectsProjectUsersService.checkGlobalRegion(this.regions);
   }
 
   downloadOpenRc() {
     this.isLoading = true;
     return this.PciProjectsProjectUsersService
-      .downloadOpenRc(this.projectId, this.user, this.region.id, this.useVersion3 ? 3 : 2)
+      .downloadOpenRc(this.projectId, this.user, this.region.id, this.getOpenRcApiVersion())
       .then(({ content }) => {
         const data = new Blob([content], { type: DOWNLOAD_TYPE });
         saveAs(data, DOWNLOAD_FILENAME);
@@ -67,4 +68,9 @@ export default class PciUsersDownloadOpenRcController {
         this.isLoading = false;
       });
   }
+
+  getOpenRcApiVersion() {
+    // Returns v3 if the region list has global regions i.e, GRA, DE, etc
+    return this.hasGlobalRegions || this.currentRegion === 'US' ? 3 : 2;
+  }
 }
diff --git a/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.html b/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.html
@@ -33,10 +33,6 @@
                 data-match="label">
             </oui-select>
         </oui-field>
-
-        <oui-field
-            data-size="xl">
-            <oui-checkbox model="$ctrl.useVersion3">{{:: 'pci_projects_project_users_download-openrc_v3_label' | translate }}</oui-checkbox>
-        </oui-field>
+        <span data-ng-if="$ctrl.getOpenRcApiVersion() === 3" data-translate="pci_projects_project_users_download-openrc_info_global"></span>
     </oui-modal>
 </form>
diff --git a/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.routing.js b/packages/manager/modules/pci/src/projects/project/users/download-openrc/download-openrc.routing.js
@@ -13,6 +13,7 @@ export default /* @ngInject */($stateProvider) => {
       layout: 'modal',
       resolve: {
         breadcrumb: () => null, // Hide breadcrumb
+        currentRegion: /* @ngInject */ coreConfig => coreConfig.getRegion(),
         userId: /* @ngInject */$transition$ => $transition$.params().userId,
         user: /* @ngInject */ (
           PciProjectsProjectUsersService,
diff --git a/packages/manager/modules/pci/src/projects/project/users/download-openrc/translations/Messages_fr_FR.json b/packages/manager/modules/pci/src/projects/project/users/download-openrc/translations/Messages_fr_FR.json
@@ -3,6 +3,7 @@
   "pci_projects_project_users_download-openrc_submit_label": "Télécharger",
   "pci_projects_project_users_download-openrc_cancel_label": "Annuler",
   "pci_projects_project_users_download-openrc_content": "Vous allez télécharger un fichier de configuration permettant de vous connecter à Openstack.",
+  "pci_projects_project_users_download-openrc_info_global": "Certains services comme l'Object Storage ou Cloud Archive sont localisés sur des régions dites 'globales' (comme GRA par exemple), la plupart des autres services sont sur des régions spécifiques (comme GRA5 par exemple).",
   "pci_projects_project_users_download-openrc_more_link": "En savoir plus",
   "pci_projects_project_users_download-openrc_region_label": "Sélectionner la région dans laquelle ce fichier s'appliquera :",
   "pci_projects_project_users_download-openrc_v3_label": "Utiliser le fichier de configuration OpenRC v3",
diff --git a/packages/manager/modules/pci/src/projects/project/users/download-rclone/download-rclone.controller.js b/packages/manager/modules/pci/src/projects/project/users/download-rclone/download-rclone.controller.js
@@ -28,6 +28,7 @@ export default class PciUsersDownloadRcloneController {
       label: this.CucRegionService.getTranslatedMicroRegion(region),
     }));
     this.region = first(this.regions);
+    this.hasGlobalRegions = this.PciProjectsProjectUsersService.checkGlobalRegion(this.regions);
   }
 
   downloadRclone() {
diff --git a/packages/manager/modules/pci/src/projects/project/users/download-rclone/download-rclone.html b/packages/manager/modules/pci/src/projects/project/users/download-rclone/download-rclone.html
@@ -24,7 +24,7 @@
         </p>
 
         <oui-field
-            data-label="{{:: 'pci_projects_project_users_download-rclone_region_label' | translate }}"
+            data-label="{{:: (!$ctrl.hasGlobalRegions ? 'pci_projects_project_users_download-rclone_region_label' : 'pci_projects_project_users_download-rclone_region_label_global') | translate }}"
             data-help-text="{{ :: 'pci_projects_project_users_download-rclone_region_help' | translate }}"
             data-size="xl">
             <oui-select
diff --git a/packages/manager/modules/pci/src/projects/project/users/download-rclone/translations/Messages_fr_FR.json b/packages/manager/modules/pci/src/projects/project/users/download-rclone/translations/Messages_fr_FR.json
@@ -2,9 +2,10 @@
   "pci_projects_project_users_download-rclone_title": "Télécharger un fichier de configuration rClone",
   "pci_projects_project_users_download-rclone_submit_label": "Télécharger",
   "pci_projects_project_users_download-rclone_cancel_label": "Annuler",
-  "pci_projects_project_users_download-rclone_content": "Vous allez télécharger un fichier de configuration permettant de vous connecter à Rclone.",
+  "pci_projects_project_users_download-rclone_content": "Vous allez télécharger un fichier de configuration permettant de vous connecter avec Rclone.",
   "pci_projects_project_users_download-rclone_more_link": "En savoir plus",
   "pci_projects_project_users_download-rclone_region_label": "Sélectionner la région dans laquelle ce fichier s'appliquera :",
+  "pci_projects_project_users_download-rclone_region_label_global": "Sélectionner la région dans laquelle ce fichier s'appliquera (seules les régions proposant les services Object Storage et Cloud Archive sont listées) :",
   "pci_projects_project_users_download-rclone_region_help": "Pour des raisons de sécurité le fichier de configuration ne contient pas votre mot de passe. Il est donc nécessaire d'éditer le fichier de configuration pour y ajouter manuellement votre mot de passe.",
   "pci_projects_project_users_download-rclone_success_message": "Le téléchargment du fichier de configuration rClone a commencé, si ce n'est pas le cas ",
   "pci_projects_project_users_download-rclone_success_message_link": "cliquez-ici",
diff --git a/packages/manager/modules/pci/src/projects/project/users/users.constants.js b/packages/manager/modules/pci/src/projects/project/users/users.constants.js
@@ -1,5 +1,7 @@
 export const HORIZON_LINK = 'https://horizon.cloud.ovh.net/openstackdashboard?username={username}';
+export const ALPHA_CHARACTERS_REGEX = /^[a-zA-Z-]+$/;
 
 export default {
   HORIZON_LINK,
+  ALPHA_CHARACTERS_REGEX,
 };
diff --git a/packages/manager/modules/pci/src/projects/project/users/users.service.js b/packages/manager/modules/pci/src/projects/project/users/users.service.js
@@ -1,6 +1,8 @@
 import get from 'lodash/get';
 import map from 'lodash/map';
+import some from 'lodash/some';
 import { OPENRC_VERSION } from './download-openrc/download-openrc.constants';
+import { ALPHA_CHARACTERS_REGEX } from './users.constants';
 
 export default class PciProjectsProjectUsersService {
   /* @ngInject */
@@ -14,6 +16,11 @@ export default class PciProjectsProjectUsersService {
     this.OvhApiCloudProject = OvhApiCloudProject;
     this.OvhApiCloudProjectRegion = OvhApiCloudProjectRegion;
     this.OvhApiCloudProjectUser = OvhApiCloudProjectUser;
+    this.ALPHA_CHARACTERS_REGEX = ALPHA_CHARACTERS_REGEX;
+  }
+
+  checkGlobalRegion(regions) {
+    return some(regions, region => this.ALPHA_CHARACTERS_REGEX.test(region.id));
   }
 
   getAll(projectId) {

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ export default class PciUsersDownloadRcloneController {`
`28`	`28`	`label: this.CucRegionService.getTranslatedMicroRegion(region),`
`29`	`29`	`}));`
`30`	`30`	`this.region = first(this.regions);`
	`31`	`+ this.hasGlobalRegions = this.PciProjectsProjectUsersService.checkGlobalRegion(this.regions);`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`downloadRclone() {`