diff options
author | Maksim Zakharov <m.zakharov@IBS.RU> | 2022-08-22 17:54:33 +0300 |
---|---|---|
committer | Maksim Zakharov <m.zakharov@IBS.RU> | 2022-08-22 17:54:33 +0300 |
commit | ea2ca8c3807b075a65c7870c5f73d4ef1f29431b (patch) | |
tree | a3801425be7c0f14aa9c24614b9c6dd9b21d8ef6 | |
parent | cdead9a0bd1a3584c5637cbbbfa477c08d70e5fe (diff) | |
download | webui-vue-ea2ca8c3807b075a65c7870c5f73d4ef1f29431b.tar.xz |
remove sorting in inventory tables
3 files changed, 2 insertions, 47 deletions
diff --git a/src/views/_sila/Overview/Inventory/InventoryTableFans.vue b/src/views/_sila/Overview/Inventory/InventoryTableFans.vue index 1012b8a9..c24066a7 100644 --- a/src/views/_sila/Overview/Inventory/InventoryTableFans.vue +++ b/src/views/_sila/Overview/Inventory/InventoryTableFans.vue @@ -15,16 +15,11 @@ </b-col> </b-row> <b-table - sort-icon-left - no-sort-reset hover responsive="md" - sort-by="health" show-empty :items="fans" :fields="fields" - :sort-desc="true" - :sort-compare="sortCompare" :filter="searchFilter" :empty-text="$t('global.table.emptyMessage')" :empty-filtered-text="$t('global.table.emptySearchMessage')" @@ -102,7 +97,6 @@ import TableCellCount from '@/components/_sila/Global/TableCellCount'; import StatusIcon from '@/components/_sila/Global/StatusIcon'; import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin'; -import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin'; import Search from '@/components/_sila/Global/Search'; import SearchFilterMixin, { searchFilter, @@ -113,12 +107,7 @@ import TableRowExpandMixin, { export default { components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount }, - mixins: [ - TableRowExpandMixin, - DataFormatterMixin, - TableSortMixin, - SearchFilterMixin, - ], + mixins: [TableRowExpandMixin, DataFormatterMixin, SearchFilterMixin], data() { return { isBusy: true, @@ -127,26 +116,22 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false, }, { key: 'name', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, - sortable: true, }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, - sortable: true, tdClass: 'text-nowrap', }, { key: 'partNumber', label: this.$t('pageInventory.table.partNumber'), formatter: this.dataFormatter, - sortable: true, }, { key: 'serialNumber', @@ -177,11 +162,6 @@ export default { }); }, methods: { - sortCompare(a, b, key) { - if (key === 'health') { - return this.sortStatus(a, b, key); - } - }, onFiltered(filteredItems) { this.searchTotalFilteredRows = filteredItems.length; }, diff --git a/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue b/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue index a55b3e5e..217a4cc3 100644 --- a/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue +++ b/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue @@ -15,16 +15,11 @@ </b-col> </b-row> <b-table - sort-icon-left - no-sort-reset hover responsive="md" - sort-by="health" show-empty :items="powerSupplies" :fields="fields" - :sort-desc="true" - :sort-compare="sortCompare" :filter="searchFilter" :empty-text="$t('global.table.emptyMessage')" :empty-filtered-text="$t('global.table.emptySearchMessage')" @@ -120,7 +115,6 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/_sila/Global/StatusIcon'; import TableCellCount from '@/components/_sila/Global/TableCellCount'; import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin'; -import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin'; import Search from '@/components/_sila/Global/Search'; import SearchFilterMixin, { searchFilter, @@ -131,12 +125,7 @@ import TableRowExpandMixin, { export default { components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount }, - mixins: [ - TableRowExpandMixin, - DataFormatterMixin, - TableSortMixin, - SearchFilterMixin, - ], + mixins: [TableRowExpandMixin, DataFormatterMixin, SearchFilterMixin], data() { return { isBusy: true, @@ -145,26 +134,22 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false, }, { key: 'id', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, - sortable: true, }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, - sortable: true, tdClass: 'text-nowrap', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), formatter: this.dataFormatter, - sortable: true, }, { key: 'identifyLed', diff --git a/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue b/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue index ed9ca194..60121818 100644 --- a/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue +++ b/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue @@ -19,14 +19,11 @@ </b-col> </b-row> <b-table - sort-icon-left - no-sort-reset hover responsive="md" show-empty :items="processors" :fields="fields" - :sort-desc="true" :filter="searchFilter" :empty-text="$t('global.table.emptyMessage')" :empty-filtered-text="$t('global.table.emptySearchMessage')" @@ -156,7 +153,6 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/_sila/Global/StatusIcon'; import TableCellCount from '@/components/_sila/Global/TableCellCount'; import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin'; -import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin'; import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin'; import Search from '@/components/_sila/Global/Search'; import SearchFilterMixin, { @@ -172,7 +168,6 @@ export default { BVToastMixin, TableRowExpandMixin, DataFormatterMixin, - TableSortMixin, SearchFilterMixin, ], data() { @@ -183,32 +178,27 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false, }, { key: 'id', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, - sortable: true, }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, - sortable: true, tdClass: 'text-nowrap', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), formatter: this.dataFormatter, - sortable: true, }, { key: 'identifyLed', label: this.$t('pageInventory.table.identifyLed'), formatter: this.dataFormatter, - sortable: false, }, ], searchFilter: searchFilter, |