From 7d41b7a5dcdf7f71a118337505ef797d1ab9df4d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranavrajs@gmail.com>
Date: Thu, 23 Apr 2020 12:21:45 +0530
Subject: [PATCH] Bug: Add account scoping in CTA (#754)

---
 .../widgets/conversation/EmptyState.vue       |  6 ++--
 app/javascript/dashboard/mixins/account.js    | 14 ++++++++
 .../dashboard/mixins/specs/account.spec.js    | 35 +++++++++++++++++++
 .../routes/dashboard/settings/inbox/Index.vue | 11 +++---
 4 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 app/javascript/dashboard/mixins/account.js
 create mode 100644 app/javascript/dashboard/mixins/specs/account.spec.js

diff --git a/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue b/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
index 2f2678954..f354ecd0c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/EmptyState.vue
@@ -40,10 +40,10 @@
 <script>
 import { mapGetters } from 'vuex';
 import adminMixin from '../../../mixins/isAdmin';
-import { frontendURL } from '../../../helper/URLHelper';
+import accountMixin from '../../../mixins/account';
 
 export default {
-  mixins: [adminMixin],
+  mixins: [accountMixin, adminMixin],
 
   computed: {
     ...mapGetters({
@@ -60,7 +60,7 @@ export default {
       return this.$t('CONVERSATION.LOADING_CONVERSATIONS');
     },
     newInboxURL() {
-      return frontendURL('settings/inboxes/new');
+      return this.addAccountScoping('settings/inboxes/new');
     },
   },
 };
diff --git a/app/javascript/dashboard/mixins/account.js b/app/javascript/dashboard/mixins/account.js
new file mode 100644
index 000000000..8ce8d2095
--- /dev/null
+++ b/app/javascript/dashboard/mixins/account.js
@@ -0,0 +1,14 @@
+import auth from '../api/auth';
+
+export default {
+  computed: {
+    accountId() {
+      return auth.getCurrentUser().account_id;
+    },
+  },
+  methods: {
+    addAccountScoping(url) {
+      return `/app/accounts/${this.accountId}/${url}`;
+    },
+  },
+};
diff --git a/app/javascript/dashboard/mixins/specs/account.spec.js b/app/javascript/dashboard/mixins/specs/account.spec.js
new file mode 100644
index 000000000..a0cbf0d0a
--- /dev/null
+++ b/app/javascript/dashboard/mixins/specs/account.spec.js
@@ -0,0 +1,35 @@
+import { createWrapper } from '@vue/test-utils';
+import accountMixin from '../account';
+import Vue from 'vue';
+
+jest.mock('../../api/auth', () => ({
+  getCurrentUser: () => ({ account_id: 1 }),
+}));
+
+describe('accountMixin', () => {
+  test('set accountId properly', () => {
+    const Component = {
+      render() {},
+      title: 'TestComponent',
+      mixins: [accountMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    expect(wrapper.vm.accountId).toBe(1);
+  });
+
+  test('returns current url', () => {
+    const Component = {
+      render() {},
+      title: 'TestComponent',
+      mixins: [accountMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    expect(wrapper.vm.addAccountScoping('settings/inboxes/new')).toBe(
+      '/app/accounts/1/settings/inboxes/new'
+    );
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index 8efa5075a..1d4ab689b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -7,7 +7,7 @@
           {{ $t('INBOX_MGMT.LIST.404') }}
           <router-link
             v-if="isAdmin()"
-            :to="frontendURL('settings/inboxes/new')"
+            :to="addAccountScoping('settings/inboxes/new')"
           >
             {{ $t('SETTINGS.INBOXES.NEW_INBOX') }}
           </router-link>
@@ -51,9 +51,7 @@
               <td>
                 <div class="button-wrapper">
                   <router-link
-                    :to="
-                      `/app/accounts/${accountId}/settings/inboxes/${item.id}`
-                    "
+                    :to="addAccountScoping(`settings/inboxes/${item.id}`)"
                   >
                     <woot-submit-button
                       v-if="isAdmin()"
@@ -107,15 +105,15 @@ import { mapGetters } from 'vuex';
 import Settings from './Settings';
 import DeleteInbox from './DeleteInbox';
 import adminMixin from '../../../../mixins/isAdmin';
-import { frontendURL } from '../../../../helper/URLHelper';
 import auth from '../../../../api/auth';
+import accountMixin from '../../../../mixins/account';
 
 export default {
   components: {
     Settings,
     DeleteInbox,
   },
-  mixins: [adminMixin],
+  mixins: [adminMixin, accountMixin],
   data() {
     return {
       loading: {},
@@ -184,7 +182,6 @@ export default {
       this.showDeletePopup = false;
       this.selectedInbox = {};
     },
-    frontendURL,
   },
 };
 </script>