diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue index 44fe5ec6fa..48c6f80a69 100644 --- a/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue +++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue @@ -13,49 +13,97 @@
- + - + - + - + - + +
- + {{ i18n.ts.search }} @@ -502,7 +550,7 @@ function onAddSortOrderButtonClicked(ev: MouseEvent) { os.contextMenu(menuItems, ev); } -async function onSearchButtonClicked() { +async function onSearchRequest() { await refreshCustomEmojis(); } diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue index c849ca110a..c791c5d82b 100644 --- a/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue +++ b/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue @@ -10,16 +10,44 @@
- + - + - + - +
@@ -46,7 +74,7 @@
- + {{ i18n.ts.search }} @@ -97,7 +125,6 @@ import { GridSetting } from '@/components/grid/grid.js'; import MkTagItem from '@/components/MkTagItem.vue'; import { deviceKind } from '@/scripts/device-kind.js'; import { MenuItem } from '@/types/menu.js'; -import MkTab from '@/components/MkTab.vue'; import MkPagingButtons from '@/components/MkPagingButtons.vue'; type GridItem = { @@ -209,7 +236,7 @@ function onAddSortOrderButtonClicked(ev: MouseEvent) { os.contextMenu(menuItems, ev); } -async function onSearchButtonClicked() { +async function onSearchRequest() { await refreshCustomEmojis(); } @@ -220,14 +247,6 @@ function onQueryResetButtonClicked() { queryPublicUrl.value = null; } -async function onLatestButtonClicked() { - await refreshCustomEmojis(); -} - -async function onOldestButtonClicked() { - await refreshCustomEmojis(); -} - async function onImportClicked() { const targets = gridItems.value.filter(it => it.checked); await importEmojis(targets); @@ -312,12 +331,18 @@ async function refreshCustomEmojis() { currentPage.value = 1; } - const result = await misskeyApi('admin/emoji/v2/list', { - limit: 100, - query: query, - page: currentPage.value, - sort: sortOrders.value.map(({ key, direction }) => ({ key: key as any, direction })), - }); + const result = await os.promiseDialog( + misskeyApi('admin/emoji/v2/list', { + limit: 100, + query: query, + page: currentPage.value, + sort: sortOrders.value.map(({ key, direction }) => ({ key: key as any, direction })), + }), + () => { + }, + () => { + }, + ); customEmojis.value = result.emojis; allPages.value = result.allPages;