fix: redirect only /default/kubernetes

Author: jleveugle

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

@@ -1,5 +1,4 @@
 import feedback from './feedback-icon.svg';
-import { DEFAULT_PROJECT_KEY } from './index.constants';
 
 import options from './navbar.config';
 
@@ -51,63 +50,4 @@ export default class PublicCloudController {
           });
       });
   }
-
-  initRedirect() {
-    return this.publicCloud
-      .getProjects([{
-        field: 'status',
-        comparator: 'in',
-        reference: ['creating', 'ok'],
-      }])
-      .then(((projects) => {
-        // if in project creation and redirected from hipay or paypal
-        // we don't necessary have any project so do not redirect to onboarding state
-        // $transition is not injected and stateParams not setted
-        // so use hash and parse it to detect if hipay/paypal param is present
-        const hashes = this.$window.location.hash.slice(
-          this.$window.location.hash.indexOf('?') + 1,
-        ).split('&');
-        // as paypal redirect to search query
-        // search also in location search
-        const searchHashes = this.$window.location.search.slice(
-          this.$window.location.search.indexOf('?') + 1,
-        ).split('&');
-        const params = {};
-        hashes.map((hash) => {
-          const [key, val] = hash.split('=');
-          params[key] = decodeURIComponent(val);
-          return true;
-        });
-        searchHashes.map((hash) => {
-          const [key, val] = hash.split('=');
-          params[key] = decodeURIComponent(val);
-          return true;
-        });
-
-        if (params.hiPayStatus || params.paypalAgreementStatus) {
-          return true;
-        }
-
-        if (projects.length > 0) {
-          return this.ovhUserPref
-            .getValue(DEFAULT_PROJECT_KEY)
-            .then(({ projectId }) => this.$state.go('pci.projects.project', {
-              projectId,
-            }))
-            .catch((err) => {
-              if (err.status === 404) {
-                // No project is defined as favorite
-                // Go on the first one :)
-                return this.$state.go('pci.projects.project', {
-                  projectId: projects[0].project_id,
-                });
-              }
-              // Go to error page
-              return this.$state.go('pci.error');
-            });
-        }
-
-        return this.$state.go('pci.projects.onboarding');
-      }));
-  }
 }

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

@@ -17,9 +17,6 @@
             <div class="d-flex w-100 h-100 position-relative">
                 <div class="w-100 h-100 position-absolute" style="top: 0; left: 0;">
                     <div class="h-100 w-100" data-ui-view>
-                        <div class="h-100 d-flex" data-ng-init="$ctrl.initRedirect()">
-                            <oui-spinner size="l" class="m-auto"></oui-spinner>
-                        </div>
                     </div>
                 </div>
             </div>

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

@@ -44,5 +44,48 @@ export default /* @ngInject */ ($stateProvider, $urlRouterProvider) => {
       },
     });
 
+  $stateProvider
+    .state('redirect-kube', {
+      url: '/pci/projects/default/kubernetes',
+      redirectTo: (trans) => {
+        const ovhUserPref = trans.injector().get('ovhUserPref');
+        const publicCloud = trans.injector().get('publicCloud');
+
+        return publicCloud
+          .getProjects([{
+            field: 'status',
+            comparator: 'in',
+            reference: ['creating', 'ok'],
+          }])
+          .then(((projects) => {
+            if (projects.length > 0) {
+              return ovhUserPref
+                .getValue(DEFAULT_PROJECT_KEY)
+                .then(({ projectId }) => ({
+                  state: 'pci.projects.project',
+                  params: {
+                    projectId,
+                  },
+                }))
+                .catch(({ status }) => {
+                  if (status === 404) {
+                    // No project is defined as favorite
+                    // Go on the first one :)
+                    return {
+                      state: 'pci.projects.project',
+                      params: {
+                        projectId: projects[0].project_id,
+                      },
+                    };
+                  }
+                  // [TODO] Go to error page
+                  return null;
+                });
+            }
+            return { state: 'pci.projects.onboarding' };
+          }));
+      },
+    });
+
   $urlRouterProvider.otherwise('/');
 };