From 377377595abb56f10b24db43774da4661b6e9f06 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 10 Aug 2020 20:23:51 +0900
Subject: [PATCH] enhance(client): Improve admin page
---
src/client/pages/instance/federation.vue | 2 +-
src/client/pages/instance/index.vue | 19 ++++++++++++++++---
.../{federation.instance.vue => instance.vue} | 0
3 files changed, 17 insertions(+), 4 deletions(-)
rename src/client/pages/instance/{federation.instance.vue => instance.vue} (100%)
diff --git a/src/client/pages/instance/federation.vue b/src/client/pages/instance/federation.vue
index 77819235d7..8c5cbe2ff3 100644
--- a/src/client/pages/instance/federation.vue
+++ b/src/client/pages/instance/federation.vue
@@ -66,7 +66,7 @@ import MkButton from '../../components/ui/button.vue';
import MkInput from '../../components/ui/input.vue';
import MkSelect from '../../components/ui/select.vue';
import MkPagination from '../../components/ui/pagination.vue';
-import MkInstanceInfo from './federation.instance.vue';
+import MkInstanceInfo from './instance.vue';
export default Vue.extend({
metaInfo() {
diff --git a/src/client/pages/instance/index.vue b/src/client/pages/instance/index.vue
index 596d145cc2..de05907816 100644
--- a/src/client/pages/instance/index.vue
+++ b/src/client/pages/instance/index.vue
@@ -90,12 +90,12 @@
<template #header><fa :icon="faClipboardList"/> {{ $t('jobQueue') }}</template>
<div class="vkyrmkwb">
- <mk-container :body-togglable="false" :resize-base-el="() => $el">
+ <mk-container :body-togglable="false" :scrollable="true" :resize-base-el="() => $el">
<template #header><fa :icon="faExclamationTriangle"/> {{ $t('delayed') }}</template>
<div class="_content">
<div class="_keyValue" v-for="job in jobs" :key="job[0]">
- <div>{{ job[0] }}</div>
+ <button class="_button" @click="showInstanceInfo(job[0])">{{ job[0] }}</button>
<div style="text-align: right;">{{ job[1] | number }} jobs</div>
</div>
</div>
@@ -173,6 +173,7 @@ import MkFolder from '../../components/ui/folder.vue';
import MkwFederation from '../../widgets/federation.vue';
import { version, url } from '../../config';
import XQueue from './index.queue-chart.vue';
+import MkInstanceInfo from './instance.vue';
const alpha = (hex, a) => {
const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)!;
@@ -495,6 +496,18 @@ export default Vue.extend({
},
methods: {
+ async showInstanceInfo(q) {
+ let instance = q;
+ if (typeof q === 'string') {
+ instance = await this.$root.api('federation/show-instance', {
+ host: q
+ });
+ }
+ this.$root.new(MkInstanceInfo, {
+ instance: instance
+ });
+ },
+
fetchLogs() {
this.$root.api('admin/logs', {
level: this.logLevel === 'all' ? null : this.logLevel,
@@ -595,7 +608,7 @@ export default Vue.extend({
.vkyrmkwb {
display: grid;
grid-template-columns: 0.5fr 1fr 1fr;
- grid-template-rows: 1fr;
+ grid-template-rows: 385px;
gap: 16px 16px;
}
diff --git a/src/client/pages/instance/federation.instance.vue b/src/client/pages/instance/instance.vue
similarity index 100%
rename from src/client/pages/instance/federation.instance.vue
rename to src/client/pages/instance/instance.vue
--
GitLab