Skip to content

Commit 58419e1

Browse files
refactor(frontend): ページ内でdocument.titleを直接操作させない, タイポ修正 など (taiyme#288) (#14778)
Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
1 parent 2250e52 commit 58419e1

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

packages/frontend/src/pages/invite.vue

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,16 @@ SPDX-License-Identifier: AGPL-3.0-only
55

66
<template>
77
<MkStickyContainer>
8-
<template #header>
9-
<MkPageHeader/>
10-
</template>
11-
<MKSpacer v-if="!instance.disableRegistration || !($i && ($i.isAdmin || $i.policies.canInvite))" :contentMax="1200">
8+
<template #header><MkPageHeader/></template>
9+
<MkSpacer v-if="!instance.disableRegistration || !($i && ($i.isAdmin || $i.policies.canInvite))" :contentMax="1200">
1210
<div :class="$style.root">
1311
<img :class="$style.img" :src="serverErrorImageUrl" class="_ghost"/>
1412
<div :class="$style.text">
1513
<i class="ti ti-alert-triangle"></i>
1614
{{ i18n.ts.nothing }}
1715
</div>
1816
</div>
19-
</MKSpacer>
17+
</MkSpacer>
2018
<MkSpacer v-else :contentMax="800">
2119
<div class="_gaps_m" style="text-align: center;">
2220
<div v-if="resetCycle && inviteLimit">{{ i18n.tsx.inviteLimitResetCycle({ time: resetCycle, limit: inviteLimit }) }}</div>

packages/frontend/src/pages/list.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ SPDX-License-Identifier: AGPL-3.0-only
66
<template>
77
<MkStickyContainer>
88
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
9-
<MKSpacer v-if="!(typeof error === 'undefined')" :contentMax="1200">
9+
<MkSpacer v-if="error != null" :contentMax="1200">
1010
<div :class="$style.root">
1111
<img :class="$style.img" :src="serverErrorImageUrl" class="_ghost"/>
1212
<p :class="$style.text">
1313
<i class="ti ti-alert-triangle"></i>
1414
{{ i18n.ts.nothing }}
1515
</p>
1616
</div>
17-
</MKSpacer>
17+
</MkSpacer>
1818
<MkSpacer v-else-if="list" :contentMax="700" :class="$style.main">
1919
<div v-if="list" class="members _margin">
2020
<div :class="$style.member_text">{{ i18n.ts.members }}</div>
@@ -50,7 +50,7 @@ const props = defineProps<{
5050
}>();
5151

5252
const list = ref<Misskey.entities.UserList | null>(null);
53-
const error = ref();
53+
const error = ref<unknown | null>(null);
5454
const users = ref<Misskey.entities.UserDetailed[]>([]);
5555

5656
function fetchList(): void {

packages/frontend/src/pages/role.vue

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ SPDX-License-Identifier: AGPL-3.0-only
66
<template>
77
<MkStickyContainer>
88
<template #header><MkPageHeader v-model:tab="tab" :tabs="headerTabs"/></template>
9-
<MKSpacer v-if="!(typeof error === 'undefined')" :contentMax="1200">
9+
<MkSpacer v-if="error != null" :contentMax="1200">
1010
<div :class="$style.root">
1111
<img :class="$style.img" :src="serverErrorImageUrl" class="_ghost"/>
1212
<p :class="$style.text">
1313
<i class="ti ti-alert-triangle"></i>
1414
{{ error }}
1515
</p>
1616
</div>
17-
</MKSpacer>
17+
</MkSpacer>
1818
<MkSpacer v-else-if="tab === 'users'" :contentMax="1200">
1919
<div class="_gaps_s">
2020
<div v-if="role">{{ role.description }}</div>
@@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
2626
</div>
2727
</MkSpacer>
2828
<MkSpacer v-else-if="tab === 'timeline'" :contentMax="700">
29-
<MkTimeline v-if="visible" ref="timeline" src="role" :role="props.role"/>
29+
<MkTimeline v-if="visible" ref="timeline" src="role" :role="props.roleId"/>
3030
<div v-else-if="!visible" class="_fullinfo">
3131
<img :src="infoImageUrl" class="_ghost"/>
3232
<div>{{ i18n.ts.nothing }}</div>
@@ -47,39 +47,39 @@ import { instanceName } from '@@/js/config.js';
4747
import { serverErrorImageUrl, infoImageUrl } from '@/instance.js';
4848

4949
const props = withDefaults(defineProps<{
50-
role: string;
50+
roleId: string;
5151
initialTab?: string;
5252
}>(), {
5353
initialTab: 'users',
5454
});
5555

56+
// eslint-disable-next-line vue/no-setup-props-reactivity-loss
5657
const tab = ref(props.initialTab);
57-
const role = ref<Misskey.entities.Role>();
58-
const error = ref();
58+
const role = ref<Misskey.entities.Role | null>(null);
59+
const error = ref<string | null>(null);
5960
const visible = ref(false);
6061

61-
watch(() => props.role, () => {
62+
watch(() => props.roleId, () => {
6263
misskeyApi('roles/show', {
63-
roleId: props.role,
64+
roleId: props.roleId,
6465
}).then(res => {
6566
role.value = res;
66-
document.title = `${role.value.name} | ${instanceName}`;
67+
error.value = null;
6768
visible.value = res.isExplorable && res.isPublic;
6869
}).catch((err) => {
6970
if (err.code === 'NO_SUCH_ROLE') {
7071
error.value = i18n.ts.noRole;
7172
} else {
7273
error.value = i18n.ts.somethingHappened;
7374
}
74-
document.title = `${error.value} | ${instanceName}`;
7575
});
7676
}, { immediate: true });
7777

7878
const users = computed(() => ({
7979
endpoint: 'roles/users' as const,
8080
limit: 30,
8181
params: {
82-
roleId: props.role,
82+
roleId: props.roleId,
8383
},
8484
}));
8585

@@ -94,7 +94,7 @@ const headerTabs = computed(() => [{
9494
}]);
9595

9696
definePageMetadata(() => ({
97-
title: role.value ? role.value.name : i18n.ts.role,
97+
title: role.value ? role.value.name : (error.value ?? i18n.ts.role),
9898
icon: 'ti ti-badge',
9999
}));
100100
</script>

packages/frontend/src/router/definition.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ const routes: RouteDef[] = [{
217217
component: page(() => import('@/pages/theme-editor.vue')),
218218
loginRequired: true,
219219
}, {
220-
path: '/roles/:role',
220+
path: '/roles/:roleId',
221221
component: page(() => import('@/pages/role.vue')),
222222
}, {
223223
path: '/user-tags/:tag',

0 commit comments

Comments
 (0)