-
+
{{ content }}
-
+
diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue
index aa4be69b2cbf..a2e70a5cad67 100644
--- a/packages/frontend/src/components/global/MkPageHeader.vue
+++ b/packages/frontend/src/components/global/MkPageHeader.vue
@@ -48,13 +48,16 @@ import { scrollToTop } from '@@/js/scroll.js';
import { globalEvents } from '@/events.js';
import { injectReactiveMetadata } from '@/scripts/page-metadata.js';
import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
-import { PageHeaderItem } from '@/types/page-header.js';
+import type { PageHeaderItem } from '@/types/page-header.js';
+import type { PageMetadata } from '@/scripts/page-metadata.js';
const props = withDefaults(defineProps<{
+ overridePageMetadata?: PageMetadata;
tabs?: Tab[];
tab?: string;
actions?: PageHeaderItem[] | null;
thin?: boolean;
+ hideTitle?: boolean;
displayMyAvatar?: boolean;
}>(), {
tabs: () => ([] as Tab[]),
@@ -64,9 +67,10 @@ const emit = defineEmits<{
(ev: 'update:tab', key: string);
}>();
-const pageMetadata = injectReactiveMetadata();
+const injectedPageMetadata = injectReactiveMetadata();
+const pageMetadata = computed(() => props.overridePageMetadata ?? injectedPageMetadata.value);
-const hideTitle = inject('shouldOmitHeaderTitle', false);
+const hideTitle = computed(() => inject('shouldOmitHeaderTitle', false) || props.hideTitle);
const thin_ = props.thin || inject('shouldHeaderThin', false);
const el = shallowRef
-
-
+
();
const props = defineProps<{
- settings: GridSetting,
- data: DataSource[]
+ settings: GridSetting;
+ data: DataSource[];
}>();
+const rootSetting: Required = {
+ noOverflowStyle: false,
+ rounded: true,
+ outerBorder: true,
+ ...props.settings.root,
+};
+
// non-reactive
// eslint-disable-next-line vue/no-setup-props-reactivity-loss
const rowSetting: Required = {
@@ -1277,32 +1288,48 @@ onMounted(() => {
overflow-x: scroll;
// firefoxだとスクロールバーがセルに重なって見づらくなってしまうのでスペースを空けておく
padding-bottom: 8px;
+
+ &.noOverflowHandling {
+ overflow-x: revert;
+ padding-bottom: 0;
+ }
}
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 55f9632ce48e..c4ea3b93e32a 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
@@ -5,137 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
-
-
- {{ i18n.ts._customEmojisManager._gridCommon.searchSettings }}
-
- {{ i18n.ts._customEmojisManager._gridCommon.searchSettingCaption }}
-
-
-
-
-
-
- {{ i18n.ts._customEmojisManager._gridCommon.registrationLogs }}
-
- {{ i18n.ts._customEmojisManager._gridCommon.registrationLogsCaption }}
-
-
-
-
-
- {{ i18n.ts._customEmojisManager._gridCommon.sortOrder }}
-
-
-
-
-
- name
-
-
- category
-
-
- aliases
-
-
-
- type
-
-
- license
-
-
- sensitive
-
-
-
-
-
-
- localOnly
-
-
-
-
-
- updatedAt(from)
-
-
- updatedAt(to)
-
-
-
- role
-
-
-
-
-
-
- {{ i18n.ts.search }}
-
-
- {{ i18n.ts.reset }}
-
-
-
@@ -143,65 +17,78 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
+
+
-
-
- {{ i18n.ts.delete }} ({{ deleteItemsCount }})
-
-
-
-
-
-
-
-
- {{ i18n.ts.update }} ({{ updatedItemsCount }})
-
- {{ i18n.ts.reset }}
-
-
+
+
+
+
+const headerTabs = computed(() => [{
+ key: 'list',
+ title: i18n.ts._customEmojisManager._local.tabTitleList,
+}, {
+ key: 'register',
+ title: i18n.ts._customEmojisManager._local.tabTitleRegister,
+}]);
+
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.logs-folder.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.logs.vue
similarity index 62%
rename from packages/frontend/src/pages/admin/custom-emojis-manager.logs-folder.vue
rename to packages/frontend/src/pages/admin/custom-emojis-manager.logs.vue
index f75f6c0da5a8..eef55a9f7ed4 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-manager.logs-folder.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.logs.vue
@@ -4,47 +4,38 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
+ {{ i18n.ts.delete }} ({{ deleteItemsCount }})
+
+
+
+
+
+
+
+
+ {{ i18n.ts.update }} ({{ updatedItemsCount }})
+
+ {{ i18n.ts.reset }}
+
+
-
-
- {{ i18n.ts._customEmojisManager._logs.showSuccessLogSwitch }}
-
-
+
{{ i18n.ts._customEmojisManager._gridCommon.sortOrder }}
@@ -74,6 +76,14 @@ SPDX-License-Identifier: AGPL-3.0-only
/>
+
+ {{ i18n.ts._customEmojisManager._gridCommon.searchLimit }}
+
+
{{ i18n.ts.search }}
@@ -85,7 +95,14 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+ {{ i18n.ts._customEmojisManager._gridCommon.registrationLogs }}
+
+ {{ i18n.ts._customEmojisManager._gridCommon.registrationLogsCaption }}
+
+
(null);
const queryLicense = ref(null);
const queryUri = ref(null);
const queryPublicUrl = ref(null);
+const queryLimit = ref(25);
const previousQuery = ref(undefined);
const sortOrders = ref[]>([]);
const requestLogs = ref([]);
@@ -325,7 +343,7 @@ async function importEmojis(targets: GridItem[]) {
if (failedItems.length > 0) {
await os.alert({
type: 'error',
- title: i18n.ts._customEmojisManager._gridCommon.alertEmojisRegisterFailedTitle,
+ title: i18n.ts.somethingHappened,
text: i18n.ts._customEmojisManager._gridCommon.alertEmojisRegisterFailedDescription,
});
}
@@ -355,7 +373,7 @@ async function refreshCustomEmojis() {
}
const result = await loadingHandler.scope(() => misskeyApi('v2/admin/emoji/list', {
- limit: 100,
+ limit: queryLimit.value,
query: query,
page: currentPage.value,
sortKeys: sortOrders.value.map(({ key, direction }) => `${direction}${key}`) as never[],
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager2.vue b/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
index a952a5a3d1cd..fb930064ffae 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
@@ -5,12 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only
(indexInfo);
const childInfo = ref(null);
const narrow = ref(false);
const view = ref(null);
@@ -81,7 +82,7 @@ const ro = new ResizeObserver((entries, observer) => {
narrow.value = entries[0].borderBoxSize[0].inlineSize < NARROW_THRESHOLD;
});
-const menuDef = computed(() => [{
+const menuDef = computed(() => [{
title: i18n.ts.quickAction,
items: [{
type: 'button',
@@ -89,7 +90,7 @@ const menuDef = computed(() => [{
text: i18n.ts.lookup,
action: adminLookup,
}, ...(instance.disableRegistration ? [{
- type: 'button',
+ type: 'button' as const,
icon: 'ti ti-user-plus',
text: i18n.ts.createInviteCode,
action: invite,
@@ -333,12 +334,14 @@ defineExpose({
height: 100%;
> .nav {
+ position: sticky;
+ top: 0;
width: 32%;
max-width: 280px;
box-sizing: border-box;
border-right: solid 0.5px var(--MI_THEME-divider);
overflow: auto;
- height: 100%;
+ height: 100dvh;
}
> .main {
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index ae01432d0c74..d05f52334e4a 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -582,7 +582,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._role.useBaseValue }}
-
+
{{ i18n.ts._role._options.avatarDecorationLimit }}
@@ -698,6 +698,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
-
-
- {{ i18n.ts._customEmojisManager._logs.failureLogNothing }}
-
+
+
-
-
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 14a3b71e5330..eecf8d739099 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue
@@ -64,6 +64,8 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts._customEmojisManager._logs.showSuccessLogSwitch }}
+
+
-
+
+
-
+
+
+ {{ i18n.ts._customEmojisManager._logs.failureLogNothing }}
-
- {{ i18n.ts._customEmojisManager._logs.logNothing }}
+ {{ i18n.ts._customEmojisManager._logs.logNothing }}
+
++
-
-
+
@@ -40,5 +39,13 @@ const headerTabs = computed(() => [{
definePageMetadata(computed(() => ({
title: i18n.ts.customEmojis,
icon: 'ti ti-icons',
+ needWideArea: true,
})));
+
+
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index 969ca8b9e84a..ea5fa457f230 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -34,6 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { onActivated, onMounted, onUnmounted, provide, watch, ref, computed } from 'vue';
import { i18n } from '@/i18n.js';
import MkSuperMenu from '@/components/MkSuperMenu.vue';
+import type { SuperMenuDef } from '@/components/MkSuperMenu.vue';
import MkInfo from '@/components/MkInfo.vue';
import { instance } from '@/instance.js';
import { lookup } from '@/scripts/lookup.js';
@@ -55,7 +56,7 @@ const indexInfo = {
provide('shouldOmitHeaderTitle', false);
-const INFO = ref(indexInfo);
+const INFO = ref