From 6d88ecbfc3ff01fbea0d472c848f52a6e6726a37 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 22 Aug 2022 12:13:53 +0530
Subject: [PATCH] Remove vue-easytable

---
 .../contacts/components/ContactsTable.vue     |  4 +--
 .../settings/campaigns/CampaignsTable.vue     |  4 +--
 .../settings/reports/components/CsatTable.vue |  6 ++--
 .../components/overview/AgentTable.vue        |  6 ++--
 app/javascript/packs/application.js           |  2 +-
 config/webpack/environment.js                 |  8 -----
 config/webpack/loaders/vue.js                 | 14 ++++----
 config/webpack/resolve.js                     |  6 +---
 package.json                                  |  3 +-
 yarn.lock                                     | 35 +------------------
 10 files changed, 20 insertions(+), 68 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
index c40c41bd8..1508bd49b 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -27,7 +27,7 @@
 
 <script>
 import { mixin as clickaway } from 'vue-clickaway';
-import { VeTable } from 'vue-easytable';
+// import { VeTable } from 'vue-easytable';
 import { getCountryFlag } from 'dashboard/helper/flag';
 
 import Spinner from 'shared/components/Spinner.vue';
@@ -40,7 +40,7 @@ export default {
   components: {
     EmptyState,
     Spinner,
-    VeTable,
+    // VeTable,
   },
   mixins: [clickaway, timeMixin],
   props: {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
index 993376f12..10429c4a8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
@@ -17,7 +17,7 @@
 
 <script>
 import { mixin as clickaway } from 'vue-clickaway';
-import { VeTable } from 'vue-easytable';
+// import { VeTable } from 'vue-easytable';
 import Spinner from 'shared/components/Spinner.vue';
 import Label from 'dashboard/components/ui/Label';
 import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
@@ -32,7 +32,7 @@ export default {
   components: {
     EmptyState,
     Spinner,
-    VeTable,
+    // VeTable,
   },
 
   mixins: [clickaway, timeMixin, campaignMixin, messageFormatterMixin],
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
index 2ced3c62a..22122af3a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
@@ -21,7 +21,7 @@
   </div>
 </template>
 <script>
-import { VeTable, VePagination } from 'vue-easytable';
+// import { VeTable, VePagination } from 'vue-easytable';
 import UserAvatarWithName from 'dashboard/components/widgets/UserAvatarWithName';
 import { CSAT_RATINGS } from 'shared/constants/messages';
 import { mapGetters } from 'vuex';
@@ -29,8 +29,8 @@ import timeMixin from 'dashboard/mixins/time';
 
 export default {
   components: {
-    VeTable,
-    VePagination,
+    // VeTable,
+    // VePagination,
   },
   mixins: [timeMixin],
   props: {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
index 4ad35288a..21f2789e2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { VeTable, VePagination } from 'vue-easytable';
+// import { VeTable, VePagination } from 'vue-easytable';
 import Spinner from 'shared/components/Spinner.vue';
 import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
@@ -39,8 +39,8 @@ export default {
   components: {
     EmptyState,
     Spinner,
-    VeTable,
-    VePagination,
+    // VeTable,
+    // VePagination,
   },
   props: {
     agents: {
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 18927a4d5..6f2f2592d 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -30,7 +30,7 @@ import router, { initalizeRouter } from '../dashboard/routes';
 import store from '../dashboard/store';
 import constants from '../dashboard/constants';
 import * as Sentry from '@sentry/vue';
-import 'vue-easytable/libs/theme-default/index.css';
+// import 'vue-easytable/libs/theme-default/index.css';
 import { Integrations } from '@sentry/tracing';
 import posthog from 'posthog-js';
 import {
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index 048f0997c..ee3f385f8 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -23,14 +23,6 @@ environment.loaders.append('audio', {
   },
 });
 
-environment.config.merge({
-  resolve: {
-    alias: {
-      vue: '@vue/compat',
-    },
-  },
-});
-
 environment.config.merge({ resolve });
 environment.config.set('output.filename', chunkData => {
   return chunkData.chunk.name === 'sdk'
diff --git a/config/webpack/loaders/vue.js b/config/webpack/loaders/vue.js
index a66d70c21..3d1cc12d6 100644
--- a/config/webpack/loaders/vue.js
+++ b/config/webpack/loaders/vue.js
@@ -1,13 +1,11 @@
 module.exports = {
   test: /\.vue(\.erb)?$/,
-  use: [{
-    loader: 'vue-loader',
-    options: {
-      compilerOptions: {
-        compatConfig: {
-          MODE: 2,
-        },
+  loader: 'vue-loader',
+  options: {
+    compilerOptions: {
+      compatConfig: {
+        MODE: 2,
       },
     },
-  }],
+  },
 };
diff --git a/config/webpack/resolve.js b/config/webpack/resolve.js
index ce17c0db4..d891cc61d 100644
--- a/config/webpack/resolve.js
+++ b/config/webpack/resolve.js
@@ -3,16 +3,12 @@ const path = require('path');
 const resolve = {
   extensions: ['.js', '.vue'],
   alias: {
-    vue$: 'vue/dist/vue.common.js',
+    vue: '@vue/compat',
     dashboard: path.resolve('./app/javascript/dashboard'),
     widget: path.resolve('./app/javascript/widget'),
     survey: path.resolve('./app/javascript/survey'),
     assets: path.resolve('./app/javascript/dashboard/assets'),
     components: path.resolve('./app/javascript/dashboard/components'),
-    './iconfont.eot': 'vue-easytable/libs/font/iconfont.eot',
-    './iconfont.woff': 'vue-easytable/libs/font/iconfont.woff',
-    './iconfont.ttf': 'vue-easytable/libs/font/iconfont.ttf',
-    './iconfont.svg': 'vue-easytable/libs/font/iconfont.svg',
   },
 };
 
diff --git a/package.json b/package.json
index 4cab4d769..bfba5b528 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
     "@sentry/tracing": "^6.19.7",
     "@sentry/vue": "^6.19.7",
     "@vue/compat": "^3.1.0",
-    "@vue/compiler-sfc": "^3.1.0",
     "activestorage": "^5.2.6",
     "axios": "^0.21.2",
     "babel-plugin-syntax-jsx": "^6.18.0",
@@ -60,7 +59,6 @@
     "vue-clickaway": "~2.1.0",
     "vue-color": "2.8.1",
     "vue-dompurify-html": "^2.5.2",
-    "vue-easytable": "2.5.5",
     "vue-i18n": "8.24.3",
     "vue-letter": "^0.1.3",
     "vue-loader": "16.0.0",
@@ -75,6 +73,7 @@
     "wavesurfer.js": "^6.0.4"
   },
   "devDependencies": {
+    "@vue/compiler-sfc": "^3.1.0",
     "@babel/core": "7.13.16",
     "@babel/plugin-proposal-class-properties": "7.13.0",
     "@babel/polyfill": "^7.12.1",
diff --git a/yarn.lock b/yarn.lock
index 124f96610..f2d387b6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6027,11 +6027,6 @@ date-format-parse@^0.2.6:
   resolved "https://registry.yarnpkg.com/date-format-parse/-/date-format-parse-0.2.6.tgz#7ed42817efb6ec39532169eada9670ae3c627aa7"
   integrity sha512-sdxnYAWmLopeb+6Hmw+vo3or4OCJOnh4+YoJ9p+Id3o2EnNP0INpTqx7wr8UregfMpgaSZAH473R/ytiaB3gVg==
 
-de-indent@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
-  integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
-
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -8164,7 +8159,7 @@ hastscript@^6.0.0:
     property-information "^5.0.0"
     space-separated-tokens "^1.0.0"
 
-he@^1.1.0, he@^1.2.0:
+he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -13538,11 +13533,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-resize-observer-polyfill@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
-  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -15718,16 +15708,6 @@ vue-dompurify-html@^2.5.2:
   dependencies:
     dompurify "^2.3.4"
 
-vue-easytable@2.5.5:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/vue-easytable/-/vue-easytable-2.5.5.tgz#0d0ac244beb853859c76191c117311b5cf9654b5"
-  integrity sha512-2dp2+OWYgCn8+g6p+7tNoCuU85OGHqk1hnQ7QnS4HUyPFVAN1n4mmG+6WkIuRKrc5wsFpsg7ZiFxHQnplos3jw==
-  dependencies:
-    lodash "^4.17.20"
-    resize-observer-polyfill "^1.5.1"
-    vue "^2.6.12"
-    vue-template-compiler "^2.6.11"
-
 vue-eslint-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz#a4ed2669f87179dedd06afdd8736acbb3a3864d6"
@@ -15802,14 +15782,6 @@ vue-router@~3.5.2:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.2.tgz#5f55e3f251970e36c3e8d88a7cd2d67a350ade5c"
   integrity sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ==
 
-vue-template-compiler@^2.6.11:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e"
-  integrity sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==
-  dependencies:
-    de-indent "^1.0.2"
-    he "^1.1.0"
-
 vue-template-es2015-compiler@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
@@ -15827,11 +15799,6 @@ vue2-datepicker@^3.9.1:
   dependencies:
     date-format-parse "^0.2.6"
 
-vue@^2.6.12:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
-  integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==
-
 vue@^3.1.0:
   version "3.2.37"
   resolved "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz#da220ccb618d78579d25b06c7c21498ca4e5452e"