From ba91c4996e37e92b247cee72272f2afe38efd81b Mon Sep 17 00:00:00 2001 From: SurenNeware 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 Change-Id: I4aeffcb333bbaf5b78bcadd711b3169b0b4cb10e --- src/views/Health/EventLogs/EventLogs.vue | 23 +++++++++++++++++++--- .../HardwareStatusTableBmcManager.vue | 5 ++++- .../HardwareStatus/HardwareStatusTableChassis.vue | 5 ++++- .../HardwareStatus/HardwareStatusTableDimmSlot.vue | 10 ++++++++-- .../HardwareStatus/HardwareStatusTableFans.vue | 10 ++++++++-- .../HardwareStatusTablePowerSupplies.vue | 10 ++++++++-- .../HardwareStatusTableProcessors.vue | 10 ++++++++-- .../HardwareStatus/HardwareStatusTableStystem.vue | 5 ++++- src/views/Health/Sensors/Sensors.vue | 14 +++++++++++-- 9 files changed, 76 insertions(+), 16 deletions(-) (limited to 'src/views/Health') diff --git a/src/views/Health/EventLogs/EventLogs.vue b/src/views/Health/EventLogs/EventLogs.vue index c620c2b6..e182708c 100644 --- a/src/views/Health/EventLogs/EventLogs.vue +++ b/src/views/Health/EventLogs/EventLogs.vue @@ -164,12 +164,22 @@ import TableToolbarExport from '@/components/Global/TableToolbarExport'; import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; import TableFilterMixin from '@/components/Mixins/TableFilterMixin'; -import BVPaginationMixin from '@/components/Mixins/BVPaginationMixin'; -import BVTableSelectableMixin from '@/components/Mixins/BVTableSelectableMixin'; +import BVPaginationMixin, { + currentPage, + perPage, + itemsPerPageOptions, +} from '@/components/Mixins/BVPaginationMixin'; +import BVTableSelectableMixin, { + selectedRows, + tableHeaderCheckboxModel, + tableHeaderCheckboxIndeterminate, +} from '@/components/Mixins/BVTableSelectableMixin'; import BVToastMixin from '@/components/Mixins/BVToastMixin'; import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; import TableSortMixin from '@/components/Mixins/TableSortMixin'; -import SearchFilterMixin from '@/components/Mixins/SearchFilterMixin'; +import SearchFilterMixin, { + searchFilter, +} from '@/components/Mixins/SearchFilterMixin'; export default { components: { @@ -254,9 +264,16 @@ export default { label: this.$t('global.action.delete'), }, ], + currentPage: currentPage, filterStartDate: null, filterEndDate: null, + itemsPerPageOptions: itemsPerPageOptions, + perPage: perPage, + searchFilter: searchFilter, searchTotalFilteredRows: 0, + selectedRows: selectedRows, + tableHeaderCheckboxModel: tableHeaderCheckboxModel, + tableHeaderCheckboxIndeterminate: tableHeaderCheckboxIndeterminate, }; }, computed: { diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue b/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue index a6342089..29a6679b 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue @@ -143,7 +143,9 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/Global/StatusIcon'; -import TableRowExpandMixin from '@/components/Mixins/TableRowExpandMixin'; +import TableRowExpandMixin, { + expandRowLabel, +} from '@/components/Mixins/TableRowExpandMixin'; import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; export default { @@ -179,6 +181,7 @@ export default { formatter: this.tableFormatter, }, ], + expandRowLabel: expandRowLabel, }; }, computed: { diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue b/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue index 4fdda506..231f7c67 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue @@ -72,7 +72,9 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/Global/StatusIcon'; -import TableRowExpandMixin from '@/components/Mixins/TableRowExpandMixin'; +import TableRowExpandMixin, { + expandRowLabel, +} from '@/components/Mixins/TableRowExpandMixin'; import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; export default { @@ -108,6 +110,7 @@ export default { formatter: this.tableFormatter, }, ], + expandRowLabel: expandRowLabel, }; }, computed: { diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue b/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue index a5953054..ce80530b 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue @@ -77,8 +77,12 @@ import TableCellCount from '@/components/Global/TableCellCount'; import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; import TableSortMixin from '@/components/Mixins/TableSortMixin'; import Search from '@/components/Global/Search'; -import SearchFilterMixin from '@/components/Mixins/SearchFilterMixin'; -import TableRowExpandMixin from '@/components/Mixins/TableRowExpandMixin'; +import SearchFilterMixin, { + searchFilter, +} from '@/components/Mixins/SearchFilterMixin'; +import TableRowExpandMixin, { + expandRowLabel, +} from '@/components/Mixins/TableRowExpandMixin'; export default { components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount }, @@ -123,7 +127,9 @@ export default { sortable: true, }, ], + searchFilter: searchFilter, searchTotalFilteredRows: 0, + expandRowLabel: expandRowLabel, }; }, computed: { diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue b/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue index 58b092da..ba2e2ced 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue @@ -76,8 +76,12 @@ import StatusIcon from '@/components/Global/StatusIcon'; import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; import TableSortMixin from '@/components/Mixins/TableSortMixin'; import Search from '@/components/Global/Search'; -import SearchFilterMixin from '@/components/Mixins/SearchFilterMixin'; -import TableRowExpandMixin from '@/components/Mixins/TableRowExpandMixin'; +import SearchFilterMixin, { + searchFilter, +} from '@/components/Mixins/SearchFilterMixin'; +import TableRowExpandMixin, { + expandRowLabel, +} from '@/components/Mixins/TableRowExpandMixin'; export default { components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount }, @@ -122,7 +126,9 @@ export default { sortable: true, }, ], + searchFilter: searchFilter, searchTotalFilteredRows: 0, + expandRowLabel: expandRowLabel, }; }, computed: { diff --git a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue b/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue index 94f5774b..366f5591 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue @@ -99,8 +99,12 @@ import TableCellCount from '@/components/Global/TableCellCount'; import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; import TableSortMixin from '@/components/Mixins/TableSortMixin'; import Search from '@/components/Global/Search'; -import SearchFilterMixin from '@/components/Mixins/SearchFilterMixin'; -import TableRowExpandMixin from '@/components/Mixins/TableRowExpandMixin'; +import SearchFilterMixin, { + searchFilter, +} from '@/components/Mixins/SearchFilterMixin'; +import TableRowExpandMixin, { + expandRowLabel, +} from '@/components/Mixins/TableRowExpandMixin'; export default { components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount }, @@ -145,7 +149,9 @@ export default { sortable: true, }, ], + searchFilter: searchFilter, searchTotalFilteredRows: 0, + expandRowLabel: expandRowLabel, }; }, computed: { diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue b/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue index fcb8ef36..d6a12871 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue @@ -106,8 +106,12 @@ import TableCellCount from '@/components/Global/TableCellCount'; import TableSortMixin from '@/components/Mixins/TableSortMixin'; import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; import Search from '@/components/Global/Search'; -import SearchFilterMixin from '@/components/Mixins/SearchFilterMixin'; -import TableRowExpandMixin from '@/components/Mixins/TableRowExpandMixin'; +import SearchFilterMixin, { + searchFilter, +} from '@/components/Mixins/SearchFilterMixin'; +import TableRowExpandMixin, { + expandRowLabel, +} from '@/components/Mixins/TableRowExpandMixin'; export default { components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount }, @@ -152,7 +156,9 @@ export default { sortable: true, }, ], + searchFilter: searchFilter, searchTotalFilteredRows: 0, + expandRowLabel: expandRowLabel, }; }, computed: { diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue b/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue index 9cb1c6ae..a89dacfe 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue @@ -84,7 +84,9 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/Global/StatusIcon'; -import TableRowExpandMixin from '@/components/Mixins/TableRowExpandMixin'; +import TableRowExpandMixin, { + expandRowLabel, +} from '@/components/Mixins/TableRowExpandMixin'; import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; export default { @@ -120,6 +122,7 @@ export default { formatter: this.tableFormatter, }, ], + expandRowLabel: expandRowLabel, }; }, computed: { diff --git a/src/views/Health/Sensors/Sensors.vue b/src/views/Health/Sensors/Sensors.vue index c9da6abb..96e6ba64 100644 --- a/src/views/Health/Sensors/Sensors.vue +++ b/src/views/Health/Sensors/Sensors.vue @@ -107,12 +107,18 @@ import TableToolbar from '@/components/Global/TableToolbar'; import TableToolbarExport from '@/components/Global/TableToolbarExport'; import TableCellCount from '@/components/Global/TableCellCount'; -import BVTableSelectableMixin from '@/components/Mixins/BVTableSelectableMixin'; +import BVTableSelectableMixin, { + selectedRows, + tableHeaderCheckboxModel, + tableHeaderCheckboxIndeterminate, +} from '@/components/Mixins/BVTableSelectableMixin'; import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; import TableFilterMixin from '@/components/Mixins/TableFilterMixin'; import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; import TableSortMixin from '@/components/Mixins/TableSortMixin'; -import SearchFilterMixin from '@/components/Mixins/SearchFilterMixin'; +import SearchFilterMixin, { + searchFilter, +} from '@/components/Mixins/SearchFilterMixin'; export default { name: 'Sensors', @@ -191,7 +197,11 @@ export default { }, ], activeFilters: [], + searchFilter: searchFilter, searchTotalFilteredRows: 0, + selectedRows: selectedRows, + tableHeaderCheckboxModel: tableHeaderCheckboxModel, + tableHeaderCheckboxIndeterminate: tableHeaderCheckboxIndeterminate, }; }, computed: { -- cgit v1.2.3