feat(public-cloud): display survey only for FR (#652)

* feat(public-cloud): display survey only for FR

* fix(public-cloud): remove unused import

Author: lizardK

packages/manager/apps/public-cloud/src/index.controller.js

@@ -16,6 +16,7 @@ export default class PublicCloudController {
     CloudSidebar,
     ovhUserPref,
     publicCloud,
+    SessionService,
   ) {
     this.$scope = $scope;
     this.$state = $state;
@@ -29,8 +30,7 @@ export default class PublicCloudController {
     this.feedback = feedback;
     this.ovhUserPref = ovhUserPref;
     this.publicCloud = publicCloud;
-
-
+    this.sessionService = SessionService;
     this.navbarOptions = options;
 
     $scope.$on('oui-step-form.submit', (event, { form }) => {
@@ -45,6 +45,10 @@ export default class PublicCloudController {
     this.$translate.refresh()
       .then(() => {
         this.sidebarLinks = this.CloudSidebar.getSidebarLinks(this.$stateParams);
+        this.sessionService.getUser()
+          .then((user) => {
+            this.user = user;
+          });
       });
   }
 

packages/manager/apps/public-cloud/src/index.html

@@ -23,7 +23,7 @@
                     </div>
                 </div>
             </div>
-            <a data-ng-if="$ctrl.feedbackUrl" data-ng-href="{{ $ctrl.feedbackUrl }}" rel="noopener" target="_blank" style="position: fixed; right: 2rem; bottom: 2rem;">
+            <a data-ng-if="$ctrl.feedbackUrl && $ctrl.user.ovhSubsidiary === 'FR'" data-ng-href="{{ $ctrl.feedbackUrl }}" rel="noopener" target="_blank" style="position: fixed; right: 2rem; bottom: 2rem;">
                 <img alt="Feedback" data-ng-src="{{ $ctrl.feedback }}" />
             </a>
             <div id="managerPreload"

packages/manager/modules/pci/src/projects/project/sidebar/sidebar.controller.js

@@ -1,8 +1,10 @@
 import isEmpty from 'lodash/isEmpty';
 import isNil from 'lodash/isNil';
 import set from 'lodash/set';
+import get from 'lodash/get';
 
 import { MENU } from './sidebar.constant';
+import { LEGACY_URLS } from './legacy-forward/forward.constants';
 
 export default class SidebarController {
   /* @ngInject */
@@ -17,6 +19,7 @@ export default class SidebarController {
     coreConfig,
     OvhApiServices,
     OvhApiCloudProject,
+    SessionService,
   ) {
     this.$translate = $translate;
     this.$transitions = $transitions;
@@ -28,6 +31,7 @@ export default class SidebarController {
     this.OvhApiServices = OvhApiServices;
     this.OvhApiCloudProject = OvhApiCloudProject;
     this.CloudSidebar = CloudSidebar;
+    this.sessionService = SessionService;
 
     this.isOpen = false;
     this.isLoading = false;
@@ -78,6 +82,12 @@ export default class SidebarController {
       }
       this.isDisplayingProjectsList = false;
     });
+
+    this.sessionService.getUser()
+      .then((user) => {
+        this.user = user;
+        this.legacyUrl = get(LEGACY_URLS, this.coreConfig.getRegion());
+      });
   }
 
   onMenuItemClick({ id }) {

packages/manager/modules/pci/src/projects/project/sidebar/sidebar.html

@@ -50,10 +50,20 @@ <h2 class="mb-0 d-inline-block" style="font-weight: 400;" data-ng-bind="$ctrl.pr
                     </li>
                     <li class="oui-sidebar-list__item sidebar-menu-orphan-item">
                         <button class="oui-sidebar-link"
+                            data-ng-if="$ctrl.user.ovhSubsidiary === 'FR'"
                             type="button"
                             data-ng-click="$ctrl.CloudSidebar.goToLegacy()"
                             data-translate="cloud_sidebar_public_cloud_project_forward_legacy">
                         </button>
+
+                        <a class="oui-sidebar-link"
+                            data-ng-if="$ctrl.user.ovhSubsidiary !== 'FR'"
+                            data-track-on="click"
+                            data-track-name="public-cloud_menu_back-to-cloud"
+                            data-track-type="action"
+                            data-ng-href="{{$ctrl.legacyUrl}}">
+                          <span data-translate="cloud_sidebar_public_cloud_project_forward_legacy"></span>
+                        </a>
                     </li>
                 </ul>
             </div>

yarn.lock

@@ -1655,10 +1655,10 @@
     rollup-pluginutils "^2.3.3"
     slash "^2.0.0"
 
-"@ovh-ux/manager-pci@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@ovh-ux/manager-pci/-/manager-pci-0.8.0.tgz#e8e57d49c925d6c35aa37b35e40afdd7c8475f12"
-  integrity sha512-8rSYpebUmFYgMEu71nq96oEg3RQqKQZIayVmANpd5SY0iJxDSuHFCe/TdB43V7Xwy8o1TeJ9ZDQ4t28tQoXEZQ==
+"@ovh-ux/manager-pci@^0.9.0":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@ovh-ux/manager-pci/-/manager-pci-0.9.1.tgz#afa2e590565f48854f65c71021bbecb74594acb9"
+  integrity sha512-+3GTHssQcjghKvxlUrR3PXpQ0ze3qUzpiwqRkSlFH7qANG9AyC9opgbwsHDI1Lb6YPORCpbv4FkfnLSlwEXIdw==
   dependencies:
     "@fortawesome/fontawesome-free" "^5.8.2"
     "@ovh-ux/manager-config" "^0.2.0"