Merge pull request #340 from weni-ai/nexus-1264-redirect-to-intellige…

…nce-next-repository [Nexus-1264] Redirects to the New Intelligence Module
weni-ai · Jun 3, 2024 · 797341c · 797341c
2 parents c0dcd37 + 9a25afe
commit 797341c
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 161 deletions.
diff --git a/config.js.tmpl b/config.js.tmpl
@@ -27,6 +27,7 @@ const runtimeVariables = (() => ({
   SENTRY_ENVIRONMENT: ('${SENTRY_ENVIRONMENT}' || ''),
   NEXUS_API_BASE_URL: '${NEXUS_API_BASE_URL}',
   FLOWS_API_BASE_URL: '${FLOWS_API_BASE_URL}',
+  INTELLIGENCE_NEXT_URL: '${INTELLIGENCE_NEXT_URL}',
 
   get(name){
     return this[name];

diff --git a/src/components/TutorialModal.vue b/src/components/TutorialModal.vue
@@ -317,9 +317,7 @@ export default {
         if (target === 'home' || target === 'new') {
           if (target === 'home') return;
           this.setTutorialActive(name);
-          this.$router.push({
-            name: 'home',
-          });
+          this.$router.push('/home');
           this.closeTutorialMenu();
         } else if (
           Object.keys(this.finished).includes(previous) ||

diff --git a/src/components/payment/PaymentOptions.vue b/src/components/payment/PaymentOptions.vue
@@ -86,9 +86,7 @@ export default {
   },
   methods: {
     goToHome() {
-      this.$router.push({
-        name: 'home',
-      });
+      this.$router.push('/home');
     },
     goToPayment() {
       this.$router.push({

diff --git a/src/components/repository/CreateRepository/CreateRepositoryForm.vue b/src/components/repository/CreateRepository/CreateRepositoryForm.vue
@@ -213,12 +213,7 @@ export default {
             description: this.data.description,
           });
 
-          this.$router.push({
-            name: 'intelligence-home',
-            params: {
-              intelligenceUuid: data.uuid,
-            },
-          });
+          this.$router.push(`/intelligences/${data.uuid}`);
         } else {
           const response = await repositoryV2.create({
             organization: this.getOrgSelected,

diff --git a/src/components/repository/home/HomeRepositoryCard.vue b/src/components/repository/home/HomeRepositoryCard.vue
@@ -663,12 +663,7 @@ export default {
         (this.type === 'repository' &&
           this.repositoryDetail?.repository_type === 'content')
       ) {
-        this.$router.push({
-          name: 'intelligence-home',
-          params: {
-            intelligenceUuid: this.repositoryDetail.uuid,
-          },
-        });
+        this.$router.push(`/intelligences/${this.repositoryDetail.uuid}`);
       } else if (this.type === 'repository') {
         let name;
 
@@ -685,13 +680,9 @@ export default {
           },
         });
       } else if (this.type === 'base') {
-        this.$router.push({
-          name: 'intelligence-content-base-edit',
-          params: {
-            intelligenceUuid: this.$route.params.intelligenceUuid,
-            contentBaseUuid: this.repositoryDetail.uuid,
-          },
-        });
+        this.$router.push(
+          `/intelligences/${this.$route.params.intelligenceUuid}/bases/${this.repositoryDetail.uuid}/edit`,
+        );
       }
     },
     async copyIntelligence() {

diff --git a/src/components/repository/sidebar/SideBar.vue b/src/components/repository/sidebar/SideBar.vue
@@ -599,10 +599,14 @@ export default {
         path !== this.$router.currentRoute.name ||
         path === 'repository-settings'
       ) {
-        this.$router.push({
-          name: `${path}`,
-          ...opts,
-        });
+        if (path === 'home') {
+          this.$router.push('/home');
+        } else {
+          this.$router.push({
+            name: `${path}`,
+            ...opts,
+          });
+        }
       }
     },
     setInitialSelectedMenu() {

diff --git a/src/router/index.js b/src/router/index.js
@@ -42,6 +42,8 @@ import nexusaiAPI from '../api/nexusaiAPI';
 
 Vue.use(Router);
 
+let nextFromRedirect = '';
+
 const router = new Router({
   mode: 'history',
   routes: [
@@ -87,13 +89,18 @@ const router = new Router({
         store.state.Auth.connectOrgUuid = to.query?.org_uuid;
         store.state.Auth.connectProjectUuid = to.query?.project_uuid;
 
+        sessionStorage.setItem('orgUuid', store.state.Auth.connectOrgUuid);
+
         sessionStorage.setItem(
           'projectUuid',
           store.state.Auth.connectProjectUuid,
         );
 
-        if (to.query.next) {
-          next(to.query.next);
+        const nextPath = to.query.next || to.query.next_from_redirect;
+
+        if (nextPath) {
+          nextFromRedirect = to.query.next_from_redirect;
+          next(nextPath);
         } else {
           next('/home');
         }
@@ -123,11 +130,6 @@ const router = new Router({
         }
       },
     },
-    {
-      path: '/home',
-      name: 'home',
-      component: Home,
-    },
     {
       path: '/new/',
       name: 'new',
@@ -149,75 +151,6 @@ const router = new Router({
         },
       ],
     },
-    {
-      path: '/brain/preview',
-      name: 'brain-preview-full-page',
-      component: RouterPreviewFullPage,
-      beforeEnter: async (to, from, next) => {
-        store.dispatch('externalLogin', { token: `Bearer ${to.query?.token}` });
-        store.dispatch('projectSelected', { project: to.query?.project_uuid });
-
-        store.state.Auth.connectProjectUuid = to.query?.project_uuid;
-
-        sessionStorage.setItem(
-          'projectUuid',
-          store.state.Auth.connectProjectUuid,
-        );
-
-        next();
-      },
-    },
-    {
-      path: '/router',
-      name: 'router',
-      component: RepositoryContentBasesForm,
-      redirect: () => {
-        return { name: 'router-personalization' };
-      },
-      async beforeEnter(_to, _from, next) {
-        const { data } = await nexusaiAPI.router.read({
-          projectUuid: store.state.Auth.connectProjectUuid,
-        });
-
-        store.state.router.contentBaseUuid = data.uuid;
-        store.state.router.intelligenceUuid = data.intelligence;
-
-        next();
-      },
-      children: [
-        {
-          path: 'personalization',
-          name: 'router-personalization',
-        },
-        {
-          path: 'content',
-          name: 'router-content',
-        },
-        {
-          path: 'actions',
-          name: 'router-actions',
-        },
-        {
-          path: 'tunings',
-          name: 'router-tunings',
-        },
-      ],
-    },
-    {
-      path: '/intelligences/:intelligenceUuid',
-      name: 'intelligence-home',
-      component: RepositoryContentBases,
-    },
-    {
-      path: '/intelligences/:intelligenceUuid/edit',
-      name: 'intelligence-edit',
-      component: RepositoryContentAdjustment,
-    },
-    {
-      path: '/intelligences/:intelligenceUuid/bases/:contentBaseUuid/edit',
-      name: 'intelligence-content-base-edit',
-      component: RepositoryContentBasesForm,
-    },
     {
       path: '/dashboard',
       name: 'dashboard',
@@ -395,6 +328,32 @@ const router = new Router({
       path: '*',
       name: '404',
       component: NotFound,
+      beforeEnter(to, _from, next) {
+        if (to.fullPath === nextFromRedirect) {
+          next();
+        } else {
+          const bearerToken = window.localStorage
+            .getItem('authToken')
+            .replace(' ', '+');
+
+          const intelligenceOrgId = store.state.Auth.org;
+          const orgUuid = sessionStorage.getItem('orgUuid');
+          const projectUuid = sessionStorage.getItem('projectUuid');
+
+          const path = `/loginexternal/${bearerToken}/${intelligenceOrgId}/${projectUuid}/`;
+
+          const redirectUrl = new URL(
+            path,
+            runtimeVariables.get('INTELLIGENCE_NEXT_URL'),
+          );
+
+          redirectUrl.searchParams.append('org_uuid', orgUuid);
+          redirectUrl.searchParams.append('project_uuid', projectUuid);
+          redirectUrl.searchParams.append('next_from_redirect', to.fullPath);
+
+          location.href = redirectUrl.toString();
+        }
+      },
     },
     {
       path: '/safariAlert/',

diff --git a/src/views/CreateRepository.vue b/src/views/CreateRepository.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="create-repository">
-    <create-repository-form/>
+    <CreateRepositoryForm />
   </div>
 </template>
 
@@ -14,22 +14,18 @@ export default {
     CreateRepositoryForm,
   },
   computed: {
-    ...mapGetters([
-      'authenticated',
-    ]),
+    ...mapGetters(['authenticated']),
   },
   mounted() {
     this.checkIsAuthenticated();
   },
   methods: {
     checkIsAuthenticated() {
       if (!this.authenticated) {
-        this.$router.push({
-          name: 'home'
-        });
+        this.$router.push('/home');
       }
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -38,5 +34,4 @@ export default {
   height: 100vh;
   width: 100%;
 }
-
 </style>
diff --git a/src/views/LandingPage.vue b/src/views/LandingPage.vue
@@ -129,9 +129,7 @@ export default {
   },
   watch: {
     authenticated() {
-      this.$router.push({
-        name: 'home',
-      });
+      this.$router.push('/home');
     },
   },
   mounted() {
@@ -141,9 +139,7 @@ export default {
   },
   methods: {
     showAllBots() {
-      this.$router.push({
-        name: 'home',
-      });
+      this.$router.push('/home');
     },
     signIn() {
       this.$router.push({

diff --git a/src/views/auth/RecoverPassword.vue b/src/views/auth/RecoverPassword.vue
@@ -29,9 +29,7 @@ export default {
   },
   methods: {
     onAuthenticated() {
-      this.$router.push({
-        name: 'home',
-      });
+      this.$router.push('/home');
     },
   },
 };

diff --git a/src/views/auth/SignIn.vue b/src/views/auth/SignIn.vue
@@ -41,9 +41,7 @@ export default {
   },
   methods: {
     onAuthenticated() {
-      this.$router.push({
-        name: 'home',
-      });
+      this.$router.push('/home');
     },
     goToCreate() {
       this.$router.push({

diff --git a/src/views/auth/SignUp.vue b/src/views/auth/SignUp.vue
@@ -88,13 +88,16 @@ export default {
   },
   watch: {
     authenticated() {
-      this.$router.push({
-        name:
-          this.authenticated &&
-          runtimeVariables.get('VUE_APP_BOTHUB_WEBAPP_PAYMENT_ENABLED')
-            ? 'payment-options'
-            : 'home',
-      });
+      if (
+        this.authenticated &&
+        runtimeVariables.get('VUE_APP_BOTHUB_WEBAPP_PAYMENT_ENABLED')
+      ) {
+        this.$router.push({
+          name: 'payment-options',
+        });
+      } else {
+        this.$router.push('/home');
+      }
     },
   },
   mounted() {

diff --git a/src/views/repository/content/Bases.vue b/src/views/repository/content/Bases.vue
@@ -9,7 +9,7 @@
               type="tertiary"
               iconCenter="arrow_left_alt"
               scheme="neutral-dark"
-              @click="$router.push({ name: 'home' })"
+              @click="$router.push('/home')"
             />
 
             <UnnnicSkeletonLoading
@@ -193,12 +193,9 @@
       @close="isAddContentBaseOpen = false"
       @success="
         ($event) =>
-          $router.push({
-            name: 'intelligence-content-base-edit',
-            params: {
-              contentBaseUuid: $event.uuid,
-            },
-          })
+          $router.push(
+            `/intelligences/${$route.params.intelligenceUuid}/bases/${$event.uuid}/edit`,
+          )
       "
     ></BaseSettingsForm>
   </div>

diff --git a/src/views/repository/content/BasesForm.vue b/src/views/repository/content/BasesForm.vue
@@ -4,14 +4,7 @@
     :title="contentBase.title"
     :dontShowBack="isRouterView"
     :brainIsDeactivated="!routerTunings.brainOn"
-    @back="
-      $router.push({
-        name: 'intelligence-home',
-        params: {
-          intelligenceUuid: intelligenceUuid,
-        },
-      })
-    "
+    @back="$router.push(`/intelligences/${intelligenceUuid}`)"
   >
     <UnnnicButton
       v-if="isRouterView"