graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-09 19:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(frontend): webhook, 連携アプリ一覧でコンテンツが重複して表示される問題を修正

Browse source 
Fix #10564
This commit is contained in:
syuilo 2023-04-10 18:56:38 +09:00
parent 48e2523081
commit 511dab0618
3 changed files with 41 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -20,6 +20,7 @@
### Client ### Client
- 常に広告を見られるオプションを追加 - 常に広告を見られるオプションを追加
- ユーザーページの画像一覧が表示されない問題を修正 - ユーザーページの画像一覧が表示されない問題を修正
- webhook, 連携アプリ一覧でコンテンツが重複して表示される問題を修正
### Server ### Server
- アンテナのノート、チャンネルのノート、通知が正常に作成できないことがある問題を修正 - アンテナのノート、チャンネルのノート、通知が正常に作成できないことがある問題を修正

45
packages/frontend/src/pages/settings/apps.vue
View file

@ -8,27 +8,29 @@
</div> </div>
</template> </template>
<template #default="{items}"> <template #default="{items}">
<div v-for="token in items" :key="token.id" class="_panel bfomjevm"> <div class="_gaps">
<img v-if="token.iconUrl" class="icon" :src="token.iconUrl" alt=""/> <div v-for="token in items" :key="token.id" class="_panel bfomjevm">
<div class="body"> <img v-if="token.iconUrl" class="icon" :src="token.iconUrl" alt=""/>
<div class="name">{{ token.name }}</div> <div class="body">
<div class="description">{{ token.description }}</div> <div class="name">{{ token.name }}</div>
<MkKeyValue oneline> <div class="description">{{ token.description }}</div>
<template #key>{{ i18n.ts.installedDate }}</template> <MkKeyValue oneline>
<template #value><MkTime :time="token.createdAt"/></template> <template #key>{{ i18n.ts.installedDate }}</template>
</MkKeyValue> <template #value><MkTime :time="token.createdAt"/></template>
<MkKeyValue oneline> </MkKeyValue>
<template #key>{{ i18n.ts.lastUsedDate }}</template> <MkKeyValue oneline>
<template #value><MkTime :time="token.lastUsedAt"/></template> <template #key>{{ i18n.ts.lastUsedDate }}</template>
</MkKeyValue> <template #value><MkTime :time="token.lastUsedAt"/></template>
<details> </MkKeyValue>
<summary>{{ i18n.ts.details }}</summary> <details>
<ul> <summary>{{ i18n.ts.details }}</summary>
<li v-for="p in token.permission" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li> <ul>
</ul> <li v-for="p in token.permission" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li>
</details> </ul>
<div class="actions"> </details>
<MkButton inline danger @click="revoke(token)"><i class="ti ti-trash"></i></MkButton> <div class="actions">
<MkButton inline danger @click="revoke(token)"><i class="ti ti-trash"></i></MkButton>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -51,6 +53,7 @@ const list = ref<any>(null);
const pagination = { const pagination = {
endpoint: 'i/apps' as const, endpoint: 'i/apps' as const,
limit: 100, limit: 100,
noPaging: true,
params: { params: {
sort: '+lastUsedAt', sort: '+lastUsedAt',
}, },

29
packages/frontend/src/pages/settings/webhook.vue
View file

@ -7,18 +7,20 @@
<FormSection> <FormSection>
<MkPagination :pagination="pagination"> <MkPagination :pagination="pagination">
<template #default="{items}"> <template #default="{items}">
<FormLink v-for="webhook in items" :key="webhook.id" :to="`/settings/webhook/edit/${webhook.id}`" class="_margin"> <div class="_gaps">
<template #icon> <FormLink v-for="webhook in items" :key="webhook.id" :to="`/settings/webhook/edit/${webhook.id}`">
<i v-if="webhook.active === false" class="ti ti-player-pause"></i> <template #icon>
<i v-else-if="webhook.latestStatus === null" class="ti ti-circle"></i> <i v-if="webhook.active === false" class="ti ti-player-pause"></i>
<i v-else-if="[200, 201, 204].includes(webhook.latestStatus)" class="ti ti-check" :style="{ color: 'var(--success)' }"></i> <i v-else-if="webhook.latestStatus === null" class="ti ti-circle"></i>
<i v-else class="ti ti-alert-triangle" :style="{ color: 'var(--error)' }"></i> <i v-else-if="[200, 201, 204].includes(webhook.latestStatus)" class="ti ti-check" :style="{ color: 'var(--success)' }"></i>
</template> <i v-else class="ti ti-alert-triangle" :style="{ color: 'var(--error)' }"></i>
{{ webhook.name || webhook.url }} </template>
<template #suffix> {{ webhook.name || webhook.url }}
<MkTime v-if="webhook.latestSentAt" :time="webhook.latestSentAt"></MkTime> <template #suffix>
</template> <MkTime v-if="webhook.latestSentAt" :time="webhook.latestSentAt"></MkTime>
</FormLink> </template>
</FormLink>
</div>
</template> </template>
</MkPagination> </MkPagination>
</FormSection> </FormSection>
@ -35,7 +37,8 @@ import { i18n } from '@/i18n';
const pagination = { const pagination = {
endpoint: 'i/webhooks/list' as const, endpoint: 'i/webhooks/list' as const,
limit: 10, limit: 100,
noPaging: true,
}; };
const headerActions = $computed(() => []); const headerActions = $computed(() => []);