Skip to content

Add sortable column headers to file tree view #4953

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.

Sign up for GitHub

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

Open
xb058t wants to merge 1 commit into
base: master
Choose a base branch
from
+171 −11
Open

Add sortable column headers to file tree view #4953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
182 changes: 171 additions & 11 deletions web/server/vue-cli/src/views/Reports.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,38 +199,140 @@
<div v-else class="tree-view-container">
<div class="tree-header">
<span class="tree-header-name">Name</span>
<span class="tree-header-cell">All</span>
<span class="tree-header-cell">
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('all')"
>
All
<v-icon
v-if="treeSortKey === 'all'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('style')"
>
<severity-icon :status="Severity.STYLE" :size="14" />
<v-icon
v-if="treeSortKey === 'style'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
<span class="tree-header-cell">
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('low')"
>
<severity-icon :status="Severity.LOW" :size="14" />
<v-icon
v-if="treeSortKey === 'low'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
<span class="tree-header-cell">
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('medium')"
>
<severity-icon :status="Severity.MEDIUM" :size="14" />
<v-icon
v-if="treeSortKey === 'medium'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
<span class="tree-header-cell">
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('high')"
>
<severity-icon :status="Severity.HIGH" :size="14" />
<v-icon
v-if="treeSortKey === 'high'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
<span class="tree-header-cell">
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('critical')"
>
<severity-icon :status="Severity.CRITICAL" :size="14" />
<v-icon
v-if="treeSortKey === 'critical'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
<span class="tree-header-cell">
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('unreviewed')"
>
<review-status-icon :status="0" :size="14" />
<v-icon
v-if="treeSortKey === 'unreviewed'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
<span class="tree-header-cell">
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('confirmed')"
>
<review-status-icon :status="1" :size="14" />
<v-icon
v-if="treeSortKey === 'confirmed'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
<span class="tree-header-cell">
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('false_positive')"
>
<review-status-icon :status="2" :size="14" />
<v-icon
v-if="treeSortKey === 'false_positive'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
<span class="tree-header-cell">
<span
class="tree-header-cell sortable"
@click="toggleTreeSort('intentional')"
>
<review-status-icon :status="3" :size="14" />
<v-icon
v-if="treeSortKey === 'intentional'"
size="12"
class="sort-icon"
>
{{ treeSortOrder === 'desc' ? 'mdi-arrow-down' : 'mdi-arrow-up' }}
</v-icon>
</span>
</div>
<v-treeview
v-model:opened="openedTreeItems"
:items="treeItems"
:items="sortedTreeItems"
item-value="fullPath"
open-on-click
density="compact"
Expand Down Expand Up @@ -426,6 +528,8 @@ const openedTreeItems = ref([]);
const allReportsFileCounts = ref({});
const fileSeverities = ref({});
const treeItems = ref([]);
const treeSortKey = ref(null);
const treeSortOrder = ref(null);

const runIds = computed(function() {
return store.getters[`${namespace}/getRunIds`];
Expand Down Expand Up @@ -500,6 +604,37 @@ const formattedReports = computed(function() {
});
});

function getTreeStatValue(item, statKey) {
return statKey === "all" ? (item.findings || 0) : (item.stats[statKey] || 0);
}

function sortTreeNodes(nodes) {
if (!nodes) return [];

const _sorted = nodes.map(node => ({ ...node }));
_sorted.forEach(node => {
if (node.children && node.children.length > 0) {
node.children = sortTreeNodes(node.children);
}
});

if (treeSortKey.value && treeSortOrder.value) {
_sorted.sort((a, b) => {
const _aVal = getTreeStatValue(a, treeSortKey.value);
const _bVal = getTreeStatValue(b, treeSortKey.value);
return treeSortOrder.value === "desc"
? _bVal - _aVal
: _aVal - _bVal;
});
}

return _sorted;
}

const sortedTreeItems = computed(function() {
return sortTreeNodes(treeItems.value);
});

watch(
[ page, itemsPerPage, sortBy ],
() => {
Expand Down Expand Up @@ -540,6 +675,18 @@ function onTreeItemClick(item) {
viewMode.value = "table";
}

function toggleTreeSort(statKey) {
if (treeSortKey.value !== statKey) {
treeSortKey.value = statKey;
treeSortOrder.value = "desc";
} else if (treeSortOrder.value === "desc") {
treeSortOrder.value = "asc";
} else {
treeSortKey.value = null;
treeSortOrder.value = null;
}
}

function i64ToNum(val) {
if (val == null) return 0;
if (typeof val === "number") return val;
Expand Down Expand Up @@ -867,6 +1014,19 @@ body {
width: 50px;
text-align: center;
flex-shrink: 0;

&.sortable {
cursor: pointer;
user-select: none;

&:hover {
color: rgb(var(--v-theme-primary));
}
}

.sort-icon {
vertical-align: middle;
}
}

.tree-row {
Expand Down
Loading