Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: history search#572 #577

Merged
merged 6 commits into from
Oct 12, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 79 additions & 20 deletions web-src/src/common/components/history/executions-log-table.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
<template>
<div class="executions-log-table">
<div class="search-container">
<div class="search-panel">
<input ref="searchField" autocomplete="off" class="search-field"
name="searchField"
placeholder="Search"
v-model="searchText">
<input :alt="isClearSearchButton ? 'Clear search' : 'Search'" :src="searchImage"
class="search-button"
type="image"
@click="searchIconClickHandler">
</div>
</div>
<table class="highlight striped">
<thead>
<tr>
Expand All @@ -11,7 +23,7 @@
</tr>
</thead>
<tbody v-if="!loading">
<tr v-for="row in rows" :key="row.id" @click="rowClick(row)">
<tr v-for="row in filteredRows" :key="row.id" @click="rowClick(row)">
<td>{{ row.id }}</td>
<td>{{ row.startTimeString }}</td>
<td>{{ row.user }}</td>
Expand All @@ -26,24 +38,26 @@

<script>
import {mapState} from 'vuex';
import ClearIcon from '@/assets/clear.png'
import SearchIcon from '@/assets/search.png'

export default {
name: 'executions-log-table',
props: {
rows: Array,
'sortColumn': {
type: String,
default: 'id'
},
'ascending': {
type: Boolean,
default: false
},
rowClick: {
type: Function
}
},

data() {
return {
searchText: '',
sortColumn: 'id',
ascending: false
}
},

methods: {
showSort: function (sortKey) {
if (this.sortColumn === sortKey) {
Expand All @@ -58,24 +72,60 @@ export default {
this.ascending = true;
this.sortColumn = sortKey;
}
},

searchIconClickHandler() {
if (this.searchText !== '') {
this.searchText = '';
}
this.$nextTick(() => {
this.$refs.searchField.focus();
});
},
},

computed: {
...mapState('history', ['loading']),

isClearSearchButton() {
return this.searchText !== '';
},

searchImage() {
return this.isClearSearchButton ? ClearIcon : SearchIcon;
},

filteredRows() {
let searchText = (this.searchText || '').trim().toLowerCase();
let resultRows;
if(!this.rows) {
resultRows = [];
} else if(searchText === '') {
resultRows = [...this.rows];
} else {
resultRows = this.rows.filter((row) => {
return row.script.toLowerCase().includes(searchText) ||
row.user.toLowerCase().includes(searchText);
});
}

let ascending = this.ascending;
let column = this.sortColumn;

this.rows.sort((a, b) => {
return resultRows.sort((a, b) => {
if (column === 'id') {
let id_a = a[sortKey];
let id_b = b[sortKey];
let id_a = a[column];
let id_b = b[column];
return ascending ? id_a - id_b : id_b - id_a

} else if (column === 'startTimeString') {
let date_a = new Date(a[sortKey]);
let date_b = new Date(b[sortKey]);
let date_a = new Date(a[column]);
let date_b = new Date(b[column]);
return ascending ? date_a - date_b : date_b - date_a

} else {
let other_a = a[sortKey].toLowerCase()
let other_b = b[sortKey].toLowerCase()
let other_a = a[column].toLowerCase()
let other_b = b[column].toLowerCase()
if (other_a > other_b) {
return ascending ? 1 : -1
} else if (other_a < other_b) {
Expand All @@ -85,10 +135,6 @@ export default {
}
});
}
},

computed: {
...mapState('history', ['loading'])
}
}
</script>
Expand Down Expand Up @@ -149,4 +195,17 @@ export default {
border-right: 4px solid transparent;
border-top: 4px solid var(--font-color-main);
}

.search-container {
min-width: 200px;
width: 50%;
}

.search-panel {
display: flex;
}

.search-button {
align-self: center;
}
</style>