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.

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

Make system monitor headers and tabs sticky #736

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Make system monitor headers and tabs sticky #736

Show file tree
Hide file tree
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
51 changes: 24 additions & 27 deletions src/components/systemmonitor/ImportStatusComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
<template>
<div>
<v-data-table
:headers="headers"
:items="importStatus"
:footer-props="{
itemsPerPageOptions: [100, 200, 300],
}"
class="elevation-1"
>
<template v-slot:[`item.lastImportTime`]="{ item }">
<v-chip
size="small"
:color="item.lastImportTimeBackgroundColor"
light
small
>{{ item.lastImportTime }}
</v-chip>
</template>
<template v-slot:[`item.fileFailed`]="{ item }">
<v-chip size="small" :color="getColor(item.fileFailed)" light small>
{{ item.fileFailed }}
</v-chip>
</template>
</v-data-table>
</div>
<v-data-table
:headers="headers"
:items="importStatus"
:footer-props="{
itemsPerPageOptions: [100, 200, 300],
}"
sticky
class="elevation-1"
>
<template v-slot:[`item.lastImportTime`]="{ item }">
<v-chip
size="small"
:color="item.lastImportTimeBackgroundColor"
light
small
>{{ item.lastImportTime }}
</v-chip>
</template>
<template v-slot:[`item.fileFailed`]="{ item }">
<v-chip size="small" :color="getColor(item.fileFailed)" light small>
{{ item.fileFailed }}
</v-chip>
</template>
</v-data-table>
</template>

<script setup lang="ts">
Expand Down Expand Up @@ -78,5 +77,3 @@ async function loadImportStatus() {
}
}
</script>

<style scoped></style>
1 change: 1 addition & 0 deletions src/components/systemmonitor/RunningTasks.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
:footer-props="{
itemsPerPageOptions: [50, 100, 150],
}"
sticky
class="elevation-1"
>
<template v-slot:item.status="{ item }">
Expand Down
34 changes: 18 additions & 16 deletions src/views/SystemMonitorDisplayView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<template>
<div style="height: 100%; overflow-y: auto">
<div>
<v-tabs v-model="selectedTab">
<v-tab value="Running tasks">Running tasks</v-tab>
<v-tab value="Import status">Import status</v-tab>
</v-tabs>
<v-window v-model="selectedTab">
<v-window-item value="Running tasks">
<running-tasks timeOut="1000"></running-tasks>
</v-window-item>
<v-window-item value="Import status">
<import-status-component timeOut="1000"></import-status-component>
</v-window-item>
</v-window>
</div>
<div class="d-flex flex-column h-100">
<v-tabs v-model="selectedTab" class="flex-0-0">
<v-tab value="Running tasks">Running tasks</v-tab>
<v-tab value="Import status">Import status</v-tab>
</v-tabs>
<v-window v-model="selectedTab" class="flex-1-1">
<v-window-item value="Running tasks" class="h-100">
<running-tasks timeOut="1000" style="max-height: 100%" />
</v-window-item>
<v-window-item value="Import status" class="h-100">
<import-status-component timeOut="1000" style="max-height: 100%" />
</v-window-item>
</v-window>
</div>
</template>

Expand All @@ -24,4 +22,8 @@ import ImportStatusComponent from '../components/systemmonitor/ImportStatusCompo
const selectedTab = ref(0)
</script>

<style scoped></style>
<style scoped>
:deep(.v-window__container) {
height: 100%;
}
</style>
Loading