From ba91c4996e37e92b247cee72272f2afe38efd81b Mon Sep 17 00:00:00 2001
From: SurenNeware <sneware9@in.ibm.com>
Date: Tue, 27 Oct 2020 14:18:54 +0530
Subject: Update data option for components using Mixin data

- Removed all the data options from all the mixins.
- Updated component data property relying on data property defined in
  mixin.
- Export data property from mixin file itself.

Signed-off-by: Suren Neware <sneware9@in.ibm.com>
Change-Id: I4aeffcb333bbaf5b78bcadd711b3169b0b4cb10e
---
 src/components/Mixins/BVPaginationMixin.js      | 53 ++++++++++++-------------
 src/components/Mixins/BVTableSelectableMixin.js | 11 ++---
 src/components/Mixins/LoadingBarMixin.js        |  7 +---
 src/components/Mixins/SearchFilterMixin.js      |  7 +---
 src/components/Mixins/TableRowExpandMixin.js    |  8 ++--
 5 files changed, 36 insertions(+), 50 deletions(-)

(limited to 'src/components/Mixins')

diff --git a/src/components/Mixins/BVPaginationMixin.js b/src/components/Mixins/BVPaginationMixin.js
index 8b52f8ba..4ccf6f2c 100644
--- a/src/components/Mixins/BVPaginationMixin.js
+++ b/src/components/Mixins/BVPaginationMixin.js
@@ -1,32 +1,29 @@
-const BVPaginationMixin = {
-  data() {
-    return {
-      currentPage: 1,
-      perPage: 20,
-      itemsPerPageOptions: [
-        {
-          value: 10,
-          text: '10',
-        },
-        {
-          value: 20,
-          text: '20',
-        },
-        {
-          value: 30,
-          text: '30',
-        },
-        {
-          value: 40,
-          text: '40',
-        },
-        {
-          value: 0,
-          text: this.$t('global.table.viewAll'),
-        },
-      ],
-    };
+import i18n from '@/i18n';
+export const currentPage = 1;
+export const perPage = 20;
+export const itemsPerPageOptions = [
+  {
+    value: 10,
+    text: '10',
+  },
+  {
+    value: 20,
+    text: '20',
+  },
+  {
+    value: 30,
+    text: '30',
   },
+  {
+    value: 40,
+    text: '40',
+  },
+  {
+    value: 0,
+    text: i18n.t('global.table.viewAll'),
+  },
+];
+const BVPaginationMixin = {
   methods: {
     getTotalRowCount(count) {
       return this.perPage === 0 ? 0 : count;
diff --git a/src/components/Mixins/BVTableSelectableMixin.js b/src/components/Mixins/BVTableSelectableMixin.js
index cee7d0c9..d41ed22c 100644
--- a/src/components/Mixins/BVTableSelectableMixin.js
+++ b/src/components/Mixins/BVTableSelectableMixin.js
@@ -1,11 +1,8 @@
+export const selectedRows = [];
+export const tableHeaderCheckboxModel = false;
+export const tableHeaderCheckboxIndeterminate = false;
+
 const BVTableSelectableMixin = {
-  data() {
-    return {
-      tableHeaderCheckboxModel: false,
-      tableHeaderCheckboxIndeterminate: false,
-      selectedRows: [],
-    };
-  },
   methods: {
     clearSelectedRows(tableRef) {
       if (tableRef) tableRef.clearSelected();
diff --git a/src/components/Mixins/LoadingBarMixin.js b/src/components/Mixins/LoadingBarMixin.js
index bb3e796e..d1152703 100644
--- a/src/components/Mixins/LoadingBarMixin.js
+++ b/src/components/Mixins/LoadingBarMixin.js
@@ -1,9 +1,6 @@
+export const loading = true;
+
 const LoadingBarMixin = {
-  data() {
-    return {
-      loading: true,
-    };
-  },
   methods: {
     startLoader() {
       this.$root.$emit('loader-start');
diff --git a/src/components/Mixins/SearchFilterMixin.js b/src/components/Mixins/SearchFilterMixin.js
index 41f93b1a..a4819e26 100644
--- a/src/components/Mixins/SearchFilterMixin.js
+++ b/src/components/Mixins/SearchFilterMixin.js
@@ -1,9 +1,6 @@
+export const searchFilter = null;
+
 const SearchFilterMixin = {
-  data() {
-    return {
-      searchFilter: null,
-    };
-  },
   methods: {
     onChangeSearchInput(searchValue) {
       this.searchFilter = searchValue;
diff --git a/src/components/Mixins/TableRowExpandMixin.js b/src/components/Mixins/TableRowExpandMixin.js
index d5246cda..7f815a46 100644
--- a/src/components/Mixins/TableRowExpandMixin.js
+++ b/src/components/Mixins/TableRowExpandMixin.js
@@ -1,9 +1,7 @@
+import i18n from '@/i18n';
+export const expandRowLabel = i18n.t('global.table.expandTableRow');
+
 const TableRowExpandMixin = {
-  data() {
-    return {
-      expandRowLabel: this.$t('global.table.expandTableRow'),
-    };
-  },
   methods: {
     toggleRowDetails(row) {
       row.toggleDetails();
-- 
cgit v1.2.3