From 386df45f71ecbdac5ef7b8d828010ac48587d479 Mon Sep 17 00:00:00 2001 From: Yoshie Muranaka Date: Thu, 18 Jun 2020 12:45:13 -0700 Subject: Update TableDataFormatter filename Changed TableDataFormatter to TableDataFormatterMixin to be consistent with other Mixin files. Signed-off-by: Yoshie Muranaka Change-Id: Iae6528deda3099cf730150164739ee2fb64bbfe3 --- src/components/Mixins/TableDataFormatter.js | 28 ---------------------- src/components/Mixins/TableDataFormatterMixin.js | 28 ++++++++++++++++++++++ .../HardwareStatusTableBmcManager.vue | 4 ++-- .../HardwareStatus/HardwareStatusTableChassis.vue | 4 ++-- .../HardwareStatus/HardwareStatusTableDimmSlot.vue | 4 ++-- .../HardwareStatus/HardwareStatusTableFans.vue | 4 ++-- .../HardwareStatusTablePowerSupplies.vue | 4 ++-- .../HardwareStatus/HardwareStatusTableStystem.vue | 4 ++-- 8 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 src/components/Mixins/TableDataFormatter.js create mode 100644 src/components/Mixins/TableDataFormatterMixin.js (limited to 'src') diff --git a/src/components/Mixins/TableDataFormatter.js b/src/components/Mixins/TableDataFormatter.js deleted file mode 100644 index 027db610..00000000 --- a/src/components/Mixins/TableDataFormatter.js +++ /dev/null @@ -1,28 +0,0 @@ -const TableDataFormatter = { - methods: { - tableFormatter(value) { - if (value === undefined || value === null || value === '') { - return '--'; - } else { - return value; - } - }, - statusIcon(status) { - switch (status) { - case 'OK': - return 'success'; - case 'Warning': - return 'warning'; - case 'Critical': - return 'danger'; - default: - return ''; - } - }, - tableFormatterArray(value) { - return value.join(', '); - } - } -}; - -export default TableDataFormatter; diff --git a/src/components/Mixins/TableDataFormatterMixin.js b/src/components/Mixins/TableDataFormatterMixin.js new file mode 100644 index 00000000..77db7de9 --- /dev/null +++ b/src/components/Mixins/TableDataFormatterMixin.js @@ -0,0 +1,28 @@ +const TableDataFormatterMixin = { + methods: { + tableFormatter(value) { + if (value === undefined || value === null || value === '') { + return '--'; + } else { + return value; + } + }, + statusIcon(status) { + switch (status) { + case 'OK': + return 'success'; + case 'Warning': + return 'warning'; + case 'Critical': + return 'danger'; + default: + return ''; + } + }, + tableFormatterArray(value) { + return value.join(', '); + } + } +}; + +export default TableDataFormatterMixin; diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue b/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue index 94dde6d4..f285fec1 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue @@ -128,11 +128,11 @@ import PageSection from '@/components/Global/PageSection'; import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/Global/StatusIcon'; -import TableDataFormatter from '@/components/Mixins/TableDataFormatter'; +import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; export default { components: { IconChevron, PageSection, StatusIcon }, - mixins: [TableDataFormatter], + mixins: [TableDataFormatterMixin], data() { return { fields: [ diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue b/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue index 48e1f97e..c17965de 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue @@ -57,11 +57,11 @@ import PageSection from '@/components/Global/PageSection'; import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/Global/StatusIcon'; -import TableDataFormatter from '@/components/Mixins/TableDataFormatter'; +import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; export default { components: { IconChevron, PageSection, StatusIcon }, - mixins: [TableDataFormatter], + mixins: [TableDataFormatterMixin], data() { return { fields: [ diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue b/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue index e8207ef2..5ba8b599 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue @@ -44,12 +44,12 @@ import PageSection from '@/components/Global/PageSection'; import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/Global/StatusIcon'; -import TableDataFormatter from '@/components/Mixins/TableDataFormatter'; +import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; import TableSortMixin from '@/components/Mixins/TableSortMixin'; export default { components: { IconChevron, PageSection, StatusIcon }, - mixins: [TableDataFormatter, TableSortMixin], + mixins: [TableDataFormatterMixin, TableSortMixin], data() { return { fields: [ diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue b/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue index 6cf51a2a..a4481e2d 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue @@ -44,12 +44,12 @@ import PageSection from '@/components/Global/PageSection'; import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/Global/StatusIcon'; -import TableDataFormatter from '@/components/Mixins/TableDataFormatter'; +import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; import TableSortMixin from '@/components/Mixins/TableSortMixin'; export default { components: { IconChevron, PageSection, StatusIcon }, - mixins: [TableDataFormatter, TableSortMixin], + mixins: [TableDataFormatterMixin, TableSortMixin], data() { return { fields: [ diff --git a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue b/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue index 3e066b73..763ab267 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue @@ -67,12 +67,12 @@ import PageSection from '@/components/Global/PageSection'; import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/Global/StatusIcon'; -import TableDataFormatter from '@/components/Mixins/TableDataFormatter'; +import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; import TableSortMixin from '@/components/Mixins/TableSortMixin'; export default { components: { IconChevron, PageSection, StatusIcon }, - mixins: [TableDataFormatter, TableSortMixin], + mixins: [TableDataFormatterMixin, TableSortMixin], data() { return { fields: [ diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue b/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue index 3894eceb..1725b66e 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue @@ -69,11 +69,11 @@ import PageSection from '@/components/Global/PageSection'; import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/Global/StatusIcon'; -import TableDataFormatter from '@/components/Mixins/TableDataFormatter'; +import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin'; export default { components: { IconChevron, PageSection, StatusIcon }, - mixins: [TableDataFormatter], + mixins: [TableDataFormatterMixin], data() { return { fields: [ -- cgit v1.2.3