diff options
author | SurenNeware <sneware9@in.ibm.com> | 2020-10-27 11:48:54 +0300 |
---|---|---|
committer | Derick Montague <derick.montague@ibm.com> | 2020-12-01 02:52:42 +0300 |
commit | ba91c4996e37e92b247cee72272f2afe38efd81b (patch) | |
tree | 8eae58ba5ee91ab8eb8d02d05f2218a340c56d28 /src/views/Health/HardwareStatus | |
parent | c42ad71d65805cf12fc5592d25814f68757be396 (diff) | |
download | webui-vue-ba91c4996e37e92b247cee72272f2afe38efd81b.tar.xz |
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
Diffstat (limited to 'src/views/Health/HardwareStatus')
7 files changed, 44 insertions, 11 deletions
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: { |