summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2024-09-23 14:42:38 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2024-09-23 14:42:38 +0900
commit1ba09e1eee572fd1f040b7d0bde040dd98e35c15 (patch)
tree074daa36f3884efd2a9da30efb458fbbfc58c409 /packages/frontend/src
parentfix(misskey-js): wrong hashtag channel param type (#14611) (diff)
downloadsharkey-1ba09e1eee572fd1f040b7d0bde040dd98e35c15.tar.gz
sharkey-1ba09e1eee572fd1f040b7d0bde040dd98e35c15.tar.bz2
sharkey-1ba09e1eee572fd1f040b7d0bde040dd98e35c15.zip
enhance(frontend): improve forms usability
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/components/MkFolder.vue2
-rw-r--r--packages/frontend/src/components/MkFormFooter.vue49
-rw-r--r--packages/frontend/src/pages/admin/performance.vue242
-rw-r--r--packages/frontend/src/pages/admin/settings.vue561
-rw-r--r--packages/frontend/src/scripts/use-form.ts55
-rw-r--r--packages/frontend/src/style.scss10
6 files changed, 485 insertions, 434 deletions
diff --git a/packages/frontend/src/components/MkFolder.vue b/packages/frontend/src/components/MkFolder.vue
index fef174fc6f..6d7b8307b3 100644
--- a/packages/frontend/src/components/MkFolder.vue
+++ b/packages/frontend/src/components/MkFolder.vue
@@ -237,6 +237,8 @@ onMounted(() => {
background: var(--acrylicBg);
-webkit-backdrop-filter: var(--blur, blur(15px));
backdrop-filter: var(--blur, blur(15px));
+ background-size: auto auto;
+ background-image: repeating-linear-gradient(135deg, transparent, transparent 5px, var(--panel) 5px, var(--panel) 10px);
border-radius: 0 0 6px 6px;
}
</style>
diff --git a/packages/frontend/src/components/MkFormFooter.vue b/packages/frontend/src/components/MkFormFooter.vue
new file mode 100644
index 0000000000..1e88d59d8e
--- /dev/null
+++ b/packages/frontend/src/components/MkFormFooter.vue
@@ -0,0 +1,49 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="$style.root">
+ <div :class="$style.text">{{ i18n.tsx.thereAreNChanges({ n: form.modifiedCount.value }) }}</div>
+ <div style="margin-left: auto;" class="_buttons">
+ <MkButton danger rounded @click="form.discard"><i class="ti ti-x"></i> {{ i18n.ts.discard }}</MkButton>
+ <MkButton primary rounded @click="form.save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
+ </div>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { } from 'vue';
+import MkButton from './MkButton.vue';
+import { i18n } from '@/i18n.js';
+
+const props = defineProps<{
+ form: {
+ modifiedCount: {
+ value: number;
+ };
+ discard: () => void;
+ save: () => void;
+ };
+}>();
+</script>
+
+<style lang="scss" module>
+.root {
+ display: flex;
+ align-items: center;
+}
+
+.text {
+ color: var(--warn);
+ font-size: 90%;
+ animation: modified-blink 2s infinite;
+}
+
+@keyframes modified-blink {
+ 0% { opacity: 1; }
+ 50% { opacity: 0.5; }
+ 100% { opacity: 1; }
+}
+</style>
diff --git a/packages/frontend/src/pages/admin/performance.vue b/packages/frontend/src/pages/admin/performance.vue
index 0f4d94aa4e..57f68a2a26 100644
--- a/packages/frontend/src/pages/admin/performance.vue
+++ b/packages/frontend/src/pages/admin/performance.vue
@@ -7,103 +7,100 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkStickyContainer>
<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
- <FormSuspense :p="init">
- <div class="_gaps">
- <div class="_panel" style="padding: 16px;">
- <MkSwitch v-model="enableServerMachineStats" @change="onChange_enableServerMachineStats">
- <template #label>{{ i18n.ts.enableServerMachineStats }}</template>
- <template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
- </MkSwitch>
- </div>
+ <div class="_gaps">
+ <div class="_panel" style="padding: 16px;">
+ <MkSwitch v-model="enableServerMachineStats" @change="onChange_enableServerMachineStats">
+ <template #label>{{ i18n.ts.enableServerMachineStats }}</template>
+ <template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
+ </MkSwitch>
+ </div>
- <div class="_panel" style="padding: 16px;">
- <MkSwitch v-model="enableIdenticonGeneration" @change="onChange_enableIdenticonGeneration">
- <template #label>{{ i18n.ts.enableIdenticonGeneration }}</template>
- <template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
- </MkSwitch>
- </div>
+ <div class="_panel" style="padding: 16px;">
+ <MkSwitch v-model="enableIdenticonGeneration" @change="onChange_enableIdenticonGeneration">
+ <template #label>{{ i18n.ts.enableIdenticonGeneration }}</template>
+ <template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
+ </MkSwitch>
+ </div>
- <div class="_panel" style="padding: 16px;">
- <MkSwitch v-model="enableChartsForRemoteUser" @change="onChange_enableChartsForRemoteUser">
- <template #label>{{ i18n.ts.enableChartsForRemoteUser }}</template>
- <template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
- </MkSwitch>
- </div>
+ <div class="_panel" style="padding: 16px;">
+ <MkSwitch v-model="enableChartsForRemoteUser" @change="onChange_enableChartsForRemoteUser">
+ <template #label>{{ i18n.ts.enableChartsForRemoteUser }}</template>
+ <template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
+ </MkSwitch>
+ </div>
- <div class="_panel" style="padding: 16px;">
- <MkSwitch v-model="enableChartsForFederatedInstances" @change="onChange_enableChartsForFederatedInstances">
- <template #label>{{ i18n.ts.enableChartsForFederatedInstances }}</template>
- <template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
- </MkSwitch>
- </div>
+ <div class="_panel" style="padding: 16px;">
+ <MkSwitch v-model="enableChartsForFederatedInstances" @change="onChange_enableChartsForFederatedInstances">
+ <template #label>{{ i18n.ts.enableChartsForFederatedInstances }}</template>
+ <template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
+ </MkSwitch>
+ </div>
- <MkFolder :defaultOpen="true">
- <template #icon><i class="ti ti-bolt"></i></template>
- <template #label>Misskey® Fan-out Timeline Technology™ (FTT)</template>
- <template v-if="enableFanoutTimeline" #suffix>Enabled</template>
- <template v-else #suffix>Disabled</template>
- <template v-if="isFttModified" #footer>
- <MkButton primary rounded @click="saveFtt">{{ i18n.ts.save }}</MkButton>
- </template>
+ <MkFolder :defaultOpen="true">
+ <template #icon><i class="ti ti-bolt"></i></template>
+ <template #label>Misskey® Fan-out Timeline Technology™ (FTT)</template>
+ <template v-if="fttForm.savedState.enableFanoutTimeline" #suffix>Enabled</template>
+ <template v-else #suffix>Disabled</template>
+ <template v-if="fttForm.modified.value" #footer>
+ <MkFormFooter :form="fttForm"/>
+ </template>
- <div class="_gaps_m">
- <MkSwitch v-model="enableFanoutTimeline">
- <template #label>{{ i18n.ts.enable }}</template>
- <template #caption>
- <div>{{ i18n.ts._serverSettings.fanoutTimelineDescription }}</div>
- <div><MkLink target="_blank" url="https://misskey-hub.net/docs/for-admin/features/ftt/">{{ i18n.ts.details }}</MkLink></div>
- </template>
- </MkSwitch>
+ <div class="_gaps_m">
+ <MkSwitch v-model="fttForm.state.enableFanoutTimeline">
+ <template #label>{{ i18n.ts.enable }}<span v-if="fttForm.modifiedStates.enableFanoutTimeline" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>
+ <div>{{ i18n.ts._serverSettings.fanoutTimelineDescription }}</div>
+ <div><MkLink target="_blank" url="https://misskey-hub.net/docs/for-admin/features/ftt/">{{ i18n.ts.details }}</MkLink></div>
+ </template>
+ </MkSwitch>
- <MkSwitch v-model="enableFanoutTimelineDbFallback">
- <template #label>{{ i18n.ts._serverSettings.fanoutTimelineDbFallback }}</template>
- <template #caption>{{ i18n.ts._serverSettings.fanoutTimelineDbFallbackDescription }}</template>
- </MkSwitch>
+ <MkSwitch v-model="fttForm.state.enableFanoutTimelineDbFallback">
+ <template #label>{{ i18n.ts._serverSettings.fanoutTimelineDbFallback }}<span v-if="fttForm.modifiedStates.enableFanoutTimelineDbFallback" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts._serverSettings.fanoutTimelineDbFallbackDescription }}</template>
+ </MkSwitch>
- <MkInput v-model="perLocalUserUserTimelineCacheMax" type="number">
- <template #label>perLocalUserUserTimelineCacheMax</template>
- </MkInput>
+ <MkInput v-model="fttForm.state.perLocalUserUserTimelineCacheMax" type="number">
+ <template #label>perLocalUserUserTimelineCacheMax<span v-if="fttForm.modifiedStates.perLocalUserUserTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
+ </MkInput>
- <MkInput v-model="perRemoteUserUserTimelineCacheMax" type="number">
- <template #label>perRemoteUserUserTimelineCacheMax</template>
- </MkInput>
+ <MkInput v-model="fttForm.state.perRemoteUserUserTimelineCacheMax" type="number">
+ <template #label>perRemoteUserUserTimelineCacheMax<span v-if="fttForm.modifiedStates.perRemoteUserUserTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
+ </MkInput>
- <MkInput v-model="perUserHomeTimelineCacheMax" type="number">
- <template #label>perUserHomeTimelineCacheMax</template>
- </MkInput>
+ <MkInput v-model="fttForm.state.perUserHomeTimelineCacheMax" type="number">
+ <template #label>perUserHomeTimelineCacheMax<span v-if="fttForm.modifiedStates.perUserHomeTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
+ </MkInput>
- <MkInput v-model="perUserListTimelineCacheMax" type="number">
- <template #label>perUserListTimelineCacheMax</template>
- </MkInput>
- </div>
- </MkFolder>
+ <MkInput v-model="fttForm.state.perUserListTimelineCacheMax" type="number">
+ <template #label>perUserListTimelineCacheMax<span v-if="fttForm.modifiedStates.perUserListTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
+ </MkInput>
+ </div>
+ </MkFolder>
- <MkFolder :defaultOpen="true">
- <template #icon><i class="ti ti-bolt"></i></template>
- <template #label>Misskey® Reactions Boost Technology™ (RBT)<span class="_beta">{{ i18n.ts.beta }}</span></template>
- <template v-if="enableReactionsBuffering" #suffix>Enabled</template>
- <template v-else #suffix>Disabled</template>
- <template v-if="isRbtModified" #footer>
- <MkButton primary rounded @click="saveRbt">{{ i18n.ts.save }}</MkButton>
- </template>
+ <MkFolder :defaultOpen="true">
+ <template #icon><i class="ti ti-bolt"></i></template>
+ <template #label>Misskey® Reactions Boost Technology™ (RBT)<span class="_beta">{{ i18n.ts.beta }}</span></template>
+ <template v-if="rbtForm.savedState.enableReactionsBuffering" #suffix>Enabled</template>
+ <template v-else #suffix>Disabled</template>
+ <template v-if="rbtForm.modified.value" #footer>
+ <MkFormFooter :form="rbtForm"/>
+ </template>
- <div class="_gaps_m">
- <MkSwitch v-model="enableReactionsBuffering">
- <template #label>{{ i18n.ts.enable }}</template>
- <template #caption>{{ i18n.ts._serverSettings.reactionsBufferingDescription }}</template>
- </MkSwitch>
- </div>
- </MkFolder>
- </div>
- </FormSuspense>
+ <div class="_gaps_m">
+ <MkSwitch v-model="rbtForm.state.enableReactionsBuffering">
+ <template #label>{{ i18n.ts.enable }}<span v-if="rbtForm.modifiedStates.enableReactionsBuffering" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts._serverSettings.reactionsBufferingDescription }}</template>
+ </MkSwitch>
+ </div>
+ </MkFolder>
+ </div>
</MkSpacer>
</MkStickyContainer>
</template>
<script lang="ts" setup>
-import { ref, computed, watch } from 'vue';
+import { ref, computed } from 'vue';
import XHeader from './_header_.vue';
-import FormSuspense from '@/components/form/suspense.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { fetchInstance } from '@/instance.js';
@@ -114,45 +111,15 @@ import MkFolder from '@/components/MkFolder.vue';
import MkInput from '@/components/MkInput.vue';
import MkLink from '@/components/MkLink.vue';
import MkButton from '@/components/MkButton.vue';
+import { useForm } from '@/scripts/use-form.js';
+import MkFormFooter from '@/components/MkFormFooter.vue';
-const enableServerMachineStats = ref<boolean>(false);
-const enableIdenticonGeneration = ref<boolean>(false);
-const enableChartsForRemoteUser = ref<boolean>(false);
-const enableChartsForFederatedInstances = ref<boolean>(false);
-const enableFanoutTimeline = ref<boolean>(false);
-const enableFanoutTimelineDbFallback = ref<boolean>(false);
-const perLocalUserUserTimelineCacheMax = ref<number>(0);
-const perRemoteUserUserTimelineCacheMax = ref<number>(0);
-const perUserHomeTimelineCacheMax = ref<number>(0);
-const perUserListTimelineCacheMax = ref<number>(0);
-const enableReactionsBuffering = ref<boolean>(false);
-
-const isFttModified = ref<boolean>(false);
-
-const isRbtModified = ref<boolean>(false);
-
-async function init() {
- const meta = await misskeyApi('admin/meta');
- enableServerMachineStats.value = meta.enableServerMachineStats;
- enableIdenticonGeneration.value = meta.enableIdenticonGeneration;
- enableChartsForRemoteUser.value = meta.enableChartsForRemoteUser;
- enableChartsForFederatedInstances.value = meta.enableChartsForFederatedInstances;
- enableFanoutTimeline.value = meta.enableFanoutTimeline;
- enableFanoutTimelineDbFallback.value = meta.enableFanoutTimelineDbFallback;
- perLocalUserUserTimelineCacheMax.value = meta.perLocalUserUserTimelineCacheMax;
- perRemoteUserUserTimelineCacheMax.value = meta.perRemoteUserUserTimelineCacheMax;
- perUserHomeTimelineCacheMax.value = meta.perUserHomeTimelineCacheMax;
- perUserListTimelineCacheMax.value = meta.perUserListTimelineCacheMax;
- enableReactionsBuffering.value = meta.enableReactionsBuffering;
+const meta = await misskeyApi('admin/meta');
- watch([enableFanoutTimeline, enableFanoutTimelineDbFallback, perLocalUserUserTimelineCacheMax, perRemoteUserUserTimelineCacheMax, perUserHomeTimelineCacheMax, perUserListTimelineCacheMax], () => {
- isFttModified.value = true;
- });
-
- watch(enableReactionsBuffering, () => {
- isRbtModified.value = true;
- });
-}
+const enableServerMachineStats = ref(meta.enableServerMachineStats);
+const enableIdenticonGeneration = ref(meta.enableIdenticonGeneration);
+const enableChartsForRemoteUser = ref(meta.enableChartsForRemoteUser);
+const enableChartsForFederatedInstances = ref(meta.enableChartsForFederatedInstances);
function onChange_enableServerMachineStats(value: boolean) {
os.apiWithDialog('admin/update-meta', {
@@ -186,28 +153,33 @@ function onChange_enableChartsForFederatedInstances(value: boolean) {
});
}
-function saveFtt() {
- os.apiWithDialog('admin/update-meta', {
- enableFanoutTimeline: enableFanoutTimeline.value,
- enableFanoutTimelineDbFallback: enableFanoutTimelineDbFallback.value,
- perLocalUserUserTimelineCacheMax: perLocalUserUserTimelineCacheMax.value,
- perRemoteUserUserTimelineCacheMax: perRemoteUserUserTimelineCacheMax.value,
- perUserHomeTimelineCacheMax: perUserHomeTimelineCacheMax.value,
- perUserListTimelineCacheMax: perUserListTimelineCacheMax.value,
- }).then(() => {
- isFttModified.value = false;
- fetchInstance(true);
+const fttForm = useForm({
+ enableFanoutTimeline: meta.enableFanoutTimeline,
+ enableFanoutTimelineDbFallback: meta.enableFanoutTimelineDbFallback,
+ perLocalUserUserTimelineCacheMax: meta.perLocalUserUserTimelineCacheMax,
+ perRemoteUserUserTimelineCacheMax: meta.perRemoteUserUserTimelineCacheMax,
+ perUserHomeTimelineCacheMax: meta.perUserHomeTimelineCacheMax,
+ perUserListTimelineCacheMax: meta.perUserListTimelineCacheMax,
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ enableFanoutTimeline: state.enableFanoutTimeline,
+ enableFanoutTimelineDbFallback: state.enableFanoutTimelineDbFallback,
+ perLocalUserUserTimelineCacheMax: state.perLocalUserUserTimelineCacheMax,
+ perRemoteUserUserTimelineCacheMax: state.perRemoteUserUserTimelineCacheMax,
+ perUserHomeTimelineCacheMax: state.perUserHomeTimelineCacheMax,
+ perUserListTimelineCacheMax: state.perUserListTimelineCacheMax,
});
-}
+ fetchInstance(true);
+});
-function saveRbt() {
- os.apiWithDialog('admin/update-meta', {
- enableReactionsBuffering: enableReactionsBuffering.value,
- }).then(() => {
- isRbtModified.value = false;
- fetchInstance(true);
+const rbtForm = useForm({
+ enableReactionsBuffering: meta.enableReactionsBuffering,
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ enableReactionsBuffering: state.enableReactionsBuffering,
});
-}
+ fetchInstance(true);
+});
const headerActions = computed(() => []);
diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 13ef494731..537c86cb14 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -8,223 +8,221 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkStickyContainer>
<template #header><XHeader :tabs="headerTabs"/></template>
<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
- <FormSuspense :p="init">
- <div class="_gaps_m">
- <MkFolder :defaultOpen="true">
- <template #icon><i class="ti ti-info-circle"></i></template>
- <template #label>{{ i18n.ts.info }}</template>
- <template #footer>
- <MkButton primary rounded @click="saveInfo">{{ i18n.ts.save }}</MkButton>
- </template>
-
- <div class="_gaps">
- <MkInput v-model="name">
- <template #label>{{ i18n.ts.instanceName }}</template>
- </MkInput>
+ <div class="_gaps_m">
+ <MkFolder :defaultOpen="true">
+ <template #icon><i class="ti ti-info-circle"></i></template>
+ <template #label>{{ i18n.ts.info }}</template>
+ <template v-if="infoForm.modified.value" #footer>
+ <MkFormFooter :form="infoForm"/>
+ </template>
- <MkInput v-model="shortName">
- <template #label>{{ i18n.ts._serverSettings.shortName }} ({{ i18n.ts.optional }})</template>
- <template #caption>{{ i18n.ts._serverSettings.shortNameDescription }}</template>
- </MkInput>
-
- <MkTextarea v-model="description">
- <template #label>{{ i18n.ts.instanceDescription }}</template>
- </MkTextarea>
+ <div class="_gaps">
+ <MkInput v-model="infoForm.state.name">
+ <template #label>{{ i18n.ts.instanceName }}<span v-if="infoForm.modifiedStates.name" class="_modified">{{ i18n.ts.modified }}</span></template>
+ </MkInput>
- <FormSplit :minWidth="300">
- <MkInput v-model="maintainerName">
- <template #label>{{ i18n.ts.maintainerName }}</template>
- </MkInput>
+ <MkInput v-model="infoForm.state.shortName">
+ <template #label>{{ i18n.ts._serverSettings.shortName }} ({{ i18n.ts.optional }})<span v-if="infoForm.modifiedStates.shortName" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts._serverSettings.shortNameDescription }}</template>
+ </MkInput>
- <MkInput v-model="maintainerEmail" type="email">
- <template #prefix><i class="ti ti-mail"></i></template>
- <template #label>{{ i18n.ts.maintainerEmail }}</template>
- </MkInput>
- </FormSplit>
+ <MkTextarea v-model="infoForm.state.description">
+ <template #label>{{ i18n.ts.instanceDescription }}<span v-if="infoForm.modifiedStates.description" class="_modified">{{ i18n.ts.modified }}</span></template>
+ </MkTextarea>
- <MkInput v-model="tosUrl" type="url">
- <template #prefix><i class="ti ti-link"></i></template>
- <template #label>{{ i18n.ts.tosUrl }}</template>
+ <FormSplit :minWidth="300">
+ <MkInput v-model="infoForm.state.maintainerName">
+ <template #label>{{ i18n.ts.maintainerName }}<span v-if="infoForm.modifiedStates.maintainerName" class="_modified">{{ i18n.ts.modified }}</span></template>
</MkInput>
- <MkInput v-model="privacyPolicyUrl" type="url">
- <template #prefix><i class="ti ti-link"></i></template>
- <template #label>{{ i18n.ts.privacyPolicyUrl }}</template>
+ <MkInput v-model="infoForm.state.maintainerEmail" type="email">
+ <template #label>{{ i18n.ts.maintainerEmail }}<span v-if="infoForm.modifiedStates.maintainerEmail" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #prefix><i class="ti ti-mail"></i></template>
</MkInput>
+ </FormSplit>
- <MkInput v-model="inquiryUrl" type="url">
- <template #prefix><i class="ti ti-link"></i></template>
- <template #label>{{ i18n.ts._serverSettings.inquiryUrl }}</template>
- <template #caption>{{ i18n.ts._serverSettings.inquiryUrlDescription }}</template>
- </MkInput>
+ <MkInput v-model="infoForm.state.tosUrl" type="url">
+ <template #label>{{ i18n.ts.tosUrl }}<span v-if="infoForm.modifiedStates.tosUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #prefix><i class="ti ti-link"></i></template>
+ </MkInput>
- <MkInput v-model="repositoryUrl" type="url">
- <template #label>{{ i18n.ts.repositoryUrl }}</template>
- <template #prefix><i class="ti ti-link"></i></template>
- <template #caption>{{ i18n.ts.repositoryUrlDescription }}</template>
- </MkInput>
+ <MkInput v-model="infoForm.state.privacyPolicyUrl" type="url">
+ <template #label>{{ i18n.ts.privacyPolicyUrl }}<span v-if="infoForm.modifiedStates.privacyPolicyUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #prefix><i class="ti ti-link"></i></template>
+ </MkInput>
- <MkInfo v-if="!instance.providesTarball && !repositoryUrl" warn>
- {{ i18n.ts.repositoryUrlOrTarballRequired }}
- </MkInfo>
+ <MkInput v-model="infoForm.state.inquiryUrl" type="url">
+ <template #label>{{ i18n.ts._serverSettings.inquiryUrl }}<span v-if="infoForm.modifiedStates.inquiryUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts._serverSettings.inquiryUrlDescription }}</template>
+ <template #prefix><i class="ti ti-link"></i></template>
+ </MkInput>
- <MkInput v-model="impressumUrl" type="url">
- <template #label>{{ i18n.ts.impressumUrl }}</template>
- <template #prefix><i class="ti ti-link"></i></template>
- <template #caption>{{ i18n.ts.impressumDescription }}</template>
- </MkInput>
- </div>
- </MkFolder>
+ <MkInput v-model="infoForm.state.repositoryUrl" type="url">
+ <template #label>{{ i18n.ts.repositoryUrl }}<span v-if="infoForm.modifiedStates.repositoryUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts.repositoryUrlDescription }}</template>
+ <template #prefix><i class="ti ti-link"></i></template>
+ </MkInput>
- <MkFolder>
- <template #icon><i class="ti ti-user-star"></i></template>
- <template #label>{{ i18n.ts.pinnedUsers }}</template>
- <template #footer>
- <MkButton primary rounded @click="save_pinnedUsers">{{ i18n.ts.save }}</MkButton>
- </template>
+ <MkInfo v-if="!instance.providesTarball && !infoForm.state.repositoryUrl" warn>
+ {{ i18n.ts.repositoryUrlOrTarballRequired }}
+ </MkInfo>
- <MkTextarea v-model="pinnedUsers">
- <template #label>{{ i18n.ts.pinnedUsers }}</template>
- <template #caption>{{ i18n.ts.pinnedUsersDescription }}</template>
- </MkTextarea>
- </MkFolder>
+ <MkInput v-model="infoForm.state.impressumUrl" type="url">
+ <template #label>{{ i18n.ts.impressumUrl }}<span v-if="infoForm.modifiedStates.impressumUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts.impressumDescription }}</template>
+ <template #prefix><i class="ti ti-link"></i></template>
+ </MkInput>
+ </div>
+ </MkFolder>
- <MkFolder>
- <template #icon><i class="ti ti-cloud"></i></template>
- <template #label>{{ i18n.ts.files }}</template>
- <template #footer>
- <MkButton primary rounded @click="saveFiles">{{ i18n.ts.save }}</MkButton>
- </template>
+ <MkFolder>
+ <template #icon><i class="ti ti-user-star"></i></template>
+ <template #label>{{ i18n.ts.pinnedUsers }}</template>
+ <template v-if="pinnedUsersForm.modified.value" #footer>
+ <MkFormFooter :form="pinnedUsersForm"/>
+ </template>
- <div class="_gaps">
- <MkSwitch v-model="cacheRemoteFiles">
- <template #label>{{ i18n.ts.cacheRemoteFiles }}</template>
- <template #caption>{{ i18n.ts.cacheRemoteFilesDescription }}{{ i18n.ts.youCanCleanRemoteFilesCache }}</template>
- </MkSwitch>
+ <MkTextarea v-model="pinnedUsersForm.state.pinnedUsers">
+ <template #label>{{ i18n.ts.pinnedUsers }}<span v-if="pinnedUsersForm.modifiedStates.pinnedUsers" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts.pinnedUsersDescription }}</template>
+ </MkTextarea>
+ </MkFolder>
- <template v-if="cacheRemoteFiles">
- <MkSwitch v-model="cacheRemoteSensitiveFiles">
- <template #label>{{ i18n.ts.cacheRemoteSensitiveFiles }}</template>
- <template #caption>{{ i18n.ts.cacheRemoteSensitiveFilesDescription }}</template>
- </MkSwitch>
- </template>
- </div>
- </MkFolder>
+ <MkFolder>
+ <template #icon><i class="ti ti-cloud"></i></template>
+ <template #label>{{ i18n.ts.files }}</template>
+ <template v-if="filesForm.modified.value" #footer>
+ <MkFormFooter :form="filesForm"/>
+ </template>
- <MkFolder>
- <template #icon><i class="ti ti-world-cog"></i></template>
- <template #label>ServiceWorker</template>
- <template #footer>
- <MkButton primary rounded @click="saveServiceWorker">{{ i18n.ts.save }}</MkButton>
- </template>
+ <div class="_gaps">
+ <MkSwitch v-model="filesForm.state.cacheRemoteFiles">
+ <template #label>{{ i18n.ts.cacheRemoteFiles }}<span v-if="filesForm.modifiedStates.cacheRemoteFiles" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts.cacheRemoteFilesDescription }}{{ i18n.ts.youCanCleanRemoteFilesCache }}</template>
+ </MkSwitch>
- <div class="_gaps">
- <MkSwitch v-model="enableServiceWorker">
- <template #label>{{ i18n.ts.enableServiceworker }}</template>
- <template #caption>{{ i18n.ts.serviceworkerInfo }}</template>
+ <template v-if="filesForm.state.cacheRemoteFiles">
+ <MkSwitch v-model="filesForm.state.cacheRemoteSensitiveFiles">
+ <template #label>{{ i18n.ts.cacheRemoteSensitiveFiles }}<span v-if="filesForm.modifiedStates.cacheRemoteSensitiveFiles" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts.cacheRemoteSensitiveFilesDescription }}</template>
</MkSwitch>
+ </template>
+ </div>
+ </MkFolder>
- <template v-if="enableServiceWorker">
- <MkInput v-model="swPublicKey">
- <template #prefix><i class="ti ti-key"></i></template>
- <template #label>Public key</template>
- </MkInput>
+ <MkFolder>
+ <template #icon><i class="ti ti-world-cog"></i></template>
+ <template #label>ServiceWorker</template>
+ <template v-if="serviceWorkerForm.modified.value" #footer>
+ <MkFormFooter :form="serviceWorkerForm"/>
+ </template>
- <MkInput v-model="swPrivateKey">
- <template #prefix><i class="ti ti-key"></i></template>
- <template #label>Private key</template>
- </MkInput>
- </template>
- </div>
- </MkFolder>
+ <div class="_gaps">
+ <MkSwitch v-model="serviceWorkerForm.state.enableServiceWorker">
+ <template #label>{{ i18n.ts.enableServiceworker }}<span v-if="serviceWorkerForm.modifiedStates.enableServiceWorker" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts.serviceworkerInfo }}</template>
+ </MkSwitch>
+
+ <template v-if="serviceWorkerForm.state.enableServiceWorker">
+ <MkInput v-model="serviceWorkerForm.state.swPublicKey">
+ <template #label>Public key<span v-if="serviceWorkerForm.modifiedStates.swPublicKey" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #prefix><i class="ti ti-key"></i></template>
+ </MkInput>
- <MkFolder>
- <template #icon><i class="ti ti-ad"></i></template>
- <template #label>{{ i18n.ts._ad.adsSettings }}</template>
- <template #footer>
- <MkButton primary rounded @click="saveAd">{{ i18n.ts.save }}</MkButton>
+ <MkInput v-model="serviceWorkerForm.state.swPrivateKey">
+ <template #label>Private key<span v-if="serviceWorkerForm.modifiedStates.swPrivateKey" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #prefix><i class="ti ti-key"></i></template>
+ </MkInput>
</template>
+ </div>
+ </MkFolder>
- <div class="_gaps">
- <div class="_gaps_s">
- <MkInput v-model="notesPerOneAd" :min="0" type="number">
- <template #label>{{ i18n.ts._ad.notesPerOneAd }}</template>
- <template #caption>{{ i18n.ts._ad.setZeroToDisable }}</template>
- </MkInput>
- <MkInfo v-if="notesPerOneAd > 0 && notesPerOneAd < 20" :warn="true">
- {{ i18n.ts._ad.adsTooClose }}
- </MkInfo>
- </div>
+ <MkFolder>
+ <template #icon><i class="ti ti-ad"></i></template>
+ <template #label>{{ i18n.ts._ad.adsSettings }}</template>
+ <template v-if="adForm.modified.value" #footer>
+ <MkFormFooter :form="adForm"/>
+ </template>
+
+ <div class="_gaps">
+ <div class="_gaps_s">
+ <MkInput v-model="adForm.state.notesPerOneAd" :min="0" type="number">
+ <template #label>{{ i18n.ts._ad.notesPerOneAd }}<span v-if="adForm.modifiedStates.notesPerOneAd" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts._ad.setZeroToDisable }}</template>
+ </MkInput>
+ <MkInfo v-if="adForm.state.notesPerOneAd > 0 && adForm.state.notesPerOneAd < 20" :warn="true">
+ {{ i18n.ts._ad.adsTooClose }}
+ </MkInfo>
</div>
- </MkFolder>
+ </div>
+ </MkFolder>
- <MkFolder>
- <template #icon><i class="ti ti-world-search"></i></template>
- <template #label>{{ i18n.ts._urlPreviewSetting.title }}</template>
- <template #footer>
- <MkButton primary rounded @click="saveUrlPreview">{{ i18n.ts.save }}</MkButton>
- </template>
+ <MkFolder>
+ <template #icon><i class="ti ti-world-search"></i></template>
+ <template #label>{{ i18n.ts._urlPreviewSetting.title }}</template>
+ <template v-if="urlPreviewForm.modified.value" #footer>
+ <MkFormFooter :form="urlPreviewForm"/>
+ </template>
- <div class="_gaps">
- <MkSwitch v-model="urlPreviewEnabled">
- <template #label>{{ i18n.ts._urlPreviewSetting.enable }}</template>
- </MkSwitch>
+ <div class="_gaps">
+ <MkSwitch v-model="urlPreviewForm.state.urlPreviewEnabled">
+ <template #label>{{ i18n.ts._urlPreviewSetting.enable }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewEnabled" class="_modified">{{ i18n.ts.modified }}</span></template>
+ </MkSwitch>
- <MkSwitch v-model="urlPreviewRequireContentLength">
- <template #label>{{ i18n.ts._urlPreviewSetting.requireContentLength }}</template>
- <template #caption>{{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}</template>
- </MkSwitch>
+ <MkSwitch v-model="urlPreviewForm.state.urlPreviewRequireContentLength">
+ <template #label>{{ i18n.ts._urlPreviewSetting.requireContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewRequireContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}</template>
+ </MkSwitch>
- <MkInput v-model="urlPreviewMaximumContentLength" type="number">
- <template #label>{{ i18n.ts._urlPreviewSetting.maximumContentLength }}</template>
- <template #caption>{{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}</template>
- </MkInput>
+ <MkInput v-model="urlPreviewForm.state.urlPreviewMaximumContentLength" type="number">
+ <template #label>{{ i18n.ts._urlPreviewSetting.maximumContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewMaximumContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}</template>
+ </MkInput>
- <MkInput v-model="urlPreviewTimeout" type="number">
- <template #label>{{ i18n.ts._urlPreviewSetting.timeout }}</template>
- <template #caption>{{ i18n.ts._urlPreviewSetting.timeoutDescription }}</template>
- </MkInput>
+ <MkInput v-model="urlPreviewForm.state.urlPreviewTimeout" type="number">
+ <template #label>{{ i18n.ts._urlPreviewSetting.timeout }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewTimeout" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts._urlPreviewSetting.timeoutDescription }}</template>
+ </MkInput>
- <MkInput v-model="urlPreviewUserAgent" type="text">
- <template #label>{{ i18n.ts._urlPreviewSetting.userAgent }}</template>
- <template #caption>{{ i18n.ts._urlPreviewSetting.userAgentDescription }}</template>
- </MkInput>
+ <MkInput v-model="urlPreviewForm.state.urlPreviewUserAgent" type="text">
+ <template #label>{{ i18n.ts._urlPreviewSetting.userAgent }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewUserAgent" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>{{ i18n.ts._urlPreviewSetting.userAgentDescription }}</template>
+ </MkInput>
- <div>
- <MkInput v-model="urlPreviewSummaryProxyUrl" type="text">
- <template #label>{{ i18n.ts._urlPreviewSetting.summaryProxy }}</template>
- <template #caption>[{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}</template>
- </MkInput>
+ <div>
+ <MkInput v-model="urlPreviewForm.state.urlPreviewSummaryProxyUrl" type="text">
+ <template #label>{{ i18n.ts._urlPreviewSetting.summaryProxy }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewSummaryProxyUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+ <template #caption>[{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}</template>
+ </MkInput>
- <div :class="$style.subCaption">
- {{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
- <ul style="padding-left: 20px; margin: 4px 0">
- <li>{{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout</li>
- <li>{{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit</li>
- <li>{{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired</li>
- <li>{{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent</li>
- </ul>
- </div>
+ <div :class="$style.subCaption">
+ {{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
+ <ul style="padding-left: 20px; margin: 4px 0">
+ <li>{{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout</li>
+ <li>{{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit</li>
+ <li>{{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired</li>
+ <li>{{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent</li>
+ </ul>
</div>
</div>
- </MkFolder>
+ </div>
+ </MkFolder>
- <MkFolder>
- <template #icon><i class="ti ti-ghost"></i></template>
- <template #label>{{ i18n.ts.proxyAccount }}</template>
+ <MkFolder>
+ <template #icon><i class="ti ti-ghost"></i></template>
+ <template #label>{{ i18n.ts.proxyAccount }}</template>
- <div class="_gaps">
- <MkInfo>{{ i18n.ts.proxyAccountDescription }}</MkInfo>
- <MkKeyValue>
- <template #key>{{ i18n.ts.proxyAccount }}</template>
- <template #value>{{ proxyAccount ? `@${proxyAccount.username}` : i18n.ts.none }}</template>
- </MkKeyValue>
+ <div class="_gaps">
+ <MkInfo>{{ i18n.ts.proxyAccountDescription }}</MkInfo>
+ <MkKeyValue>
+ <template #key>{{ i18n.ts.proxyAccount }}</template>
+ <template #value>{{ proxyAccount ? `@${proxyAccount.username}` : i18n.ts.none }}</template>
+ </MkKeyValue>
- <MkButton primary @click="chooseProxyAccount">{{ i18n.ts.selectAccount }}</MkButton>
- </div>
- </MkFolder>
- </div>
- </FormSuspense>
+ <MkButton primary @click="chooseProxyAccount">{{ i18n.ts.selectAccount }}</MkButton>
+ </div>
+ </MkFolder>
+ </div>
</MkSpacer>
</MkStickyContainer>
</div>
@@ -239,7 +237,6 @@ import MkInput from '@/components/MkInput.vue';
import MkTextarea from '@/components/MkTextarea.vue';
import MkInfo from '@/components/MkInfo.vue';
import FormSplit from '@/components/form/split.vue';
-import FormSuspense from '@/components/form/suspense.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { fetchInstance, instance } from '@/instance.js';
@@ -249,143 +246,109 @@ import MkButton from '@/components/MkButton.vue';
import MkFolder from '@/components/MkFolder.vue';
import MkSelect from '@/components/MkSelect.vue';
import MkKeyValue from '@/components/MkKeyValue.vue';
+import { useForm } from '@/scripts/use-form.js';
+import MkFormFooter from '@/components/MkFormFooter.vue';
-const proxyAccount = ref<Misskey.entities.UserDetailed | null>(null);
+const meta = await misskeyApi('admin/meta');
-const name = ref<string | null>(null);
-const shortName = ref<string | null>(null);
-const description = ref<string | null>(null);
-const maintainerName = ref<string | null>(null);
-const maintainerEmail = ref<string | null>(null);
-const tosUrl = ref<string | null>(null);
-const privacyPolicyUrl = ref<string | null>(null);
-const inquiryUrl = ref<string | null>(null);
-const repositoryUrl = ref<string | null>(null);
-const impressumUrl = ref<string | null>(null);
-const pinnedUsers = ref<string>('');
-const cacheRemoteFiles = ref<boolean>(false);
-const cacheRemoteSensitiveFiles = ref<boolean>(false);
-const enableServiceWorker = ref<boolean>(false);
-const swPublicKey = ref<string | null>(null);
-const swPrivateKey = ref<string | null>(null);
-const notesPerOneAd = ref<number>(0);
-const urlPreviewEnabled = ref<boolean>(true);
-const urlPreviewTimeout = ref<number>(10000);
-const urlPreviewMaximumContentLength = ref<number>(1024 * 1024 * 10);
-const urlPreviewRequireContentLength = ref<boolean>(true);
-const urlPreviewUserAgent = ref<string | null>(null);
-const urlPreviewSummaryProxyUrl = ref<string | null>(null);
-const proxyAccountId = ref<string | null>(null);
+const proxyAccount = ref(meta.proxyAccountId ? await misskeyApi('users/show', { userId: meta.proxyAccountId }) : null);
-async function init(): Promise<void> {
- const meta = await misskeyApi('admin/meta');
- name.value = meta.name;
- shortName.value = meta.shortName;
- description.value = meta.description;
- maintainerName.value = meta.maintainerName;
- maintainerEmail.value = meta.maintainerEmail;
- tosUrl.value = meta.tosUrl;
- privacyPolicyUrl.value = meta.privacyPolicyUrl;
- inquiryUrl.value = meta.inquiryUrl;
- repositoryUrl.value = meta.repositoryUrl;
- impressumUrl.value = meta.impressumUrl;
- pinnedUsers.value = meta.pinnedUsers.join('\n');
- cacheRemoteFiles.value = meta.cacheRemoteFiles;
- cacheRemoteSensitiveFiles.value = meta.cacheRemoteSensitiveFiles;
- enableServiceWorker.value = meta.enableServiceWorker;
- swPublicKey.value = meta.swPublickey;
- swPrivateKey.value = meta.swPrivateKey;
- notesPerOneAd.value = meta.notesPerOneAd;
- urlPreviewEnabled.value = meta.urlPreviewEnabled;
- urlPreviewTimeout.value = meta.urlPreviewTimeout;
- urlPreviewMaximumContentLength.value = meta.urlPreviewMaximumContentLength;
- urlPreviewRequireContentLength.value = meta.urlPreviewRequireContentLength;
- urlPreviewUserAgent.value = meta.urlPreviewUserAgent;
- urlPreviewSummaryProxyUrl.value = meta.urlPreviewSummaryProxyUrl;
- proxyAccountId.value = meta.proxyAccountId;
- if (proxyAccountId.value) {
- proxyAccount.value = await misskeyApi('users/show', { userId: proxyAccountId.value });
- }
-}
-
-function saveInfo() {
- os.apiWithDialog('admin/update-meta', {
- name: name.value,
- shortName: shortName.value === '' ? null : shortName.value,
- description: description.value,
- maintainerName: maintainerName.value,
- maintainerEmail: maintainerEmail.value,
- tosUrl: tosUrl.value,
- privacyPolicyUrl: privacyPolicyUrl.value,
- inquiryUrl: inquiryUrl.value,
- repositoryUrl: repositoryUrl.value,
- impressumUrl: impressumUrl.value,
- }).then(() => {
- fetchInstance(true);
+const infoForm = useForm({
+ name: meta.name ?? '',
+ shortName: meta.shortName ?? '',
+ description: meta.description ?? '',
+ maintainerName: meta.maintainerName ?? '',
+ maintainerEmail: meta.maintainerEmail ?? '',
+ tosUrl: meta.tosUrl ?? '',
+ privacyPolicyUrl: meta.privacyPolicyUrl ?? '',
+ inquiryUrl: meta.inquiryUrl ?? '',
+ repositoryUrl: meta.repositoryUrl ?? '',
+ impressumUrl: meta.impressumUrl ?? '',
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ name: state.name,
+ shortName: state.shortName === '' ? null : state.shortName,
+ description: state.description,
+ maintainerName: state.maintainerName,
+ maintainerEmail: state.maintainerEmail,
+ tosUrl: state.tosUrl,
+ privacyPolicyUrl: state.privacyPolicyUrl,
+ inquiryUrl: state.inquiryUrl,
+ repositoryUrl: state.repositoryUrl,
+ impressumUrl: state.impressumUrl,
});
-}
+ fetchInstance(true);
+});
-function save_pinnedUsers() {
- os.apiWithDialog('admin/update-meta', {
- pinnedUsers: pinnedUsers.value.split('\n'),
- }).then(() => {
- fetchInstance(true);
+const pinnedUsersForm = useForm({
+ pinnedUsers: meta.pinnedUsers.join('\n'),
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ pinnedUsers: state.pinnedUsers.split('\n'),
});
-}
+ fetchInstance(true);
+});
-function saveFiles() {
- os.apiWithDialog('admin/update-meta', {
- cacheRemoteFiles: cacheRemoteFiles.value,
- cacheRemoteSensitiveFiles: cacheRemoteSensitiveFiles.value,
- }).then(() => {
- fetchInstance(true);
+const filesForm = useForm({
+ cacheRemoteFiles: meta.cacheRemoteFiles,
+ cacheRemoteSensitiveFiles: meta.cacheRemoteSensitiveFiles,
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ cacheRemoteFiles: state.cacheRemoteFiles,
+ cacheRemoteSensitiveFiles: state.cacheRemoteSensitiveFiles,
});
-}
+ fetchInstance(true);
+});
-function saveServiceWorker() {
- os.apiWithDialog('admin/update-meta', {
- enableServiceWorker: enableServiceWorker.value,
- swPublicKey: swPublicKey.value,
- swPrivateKey: swPrivateKey.value,
- }).then(() => {
- fetchInstance(true);
+const serviceWorkerForm = useForm({
+ enableServiceWorker: meta.enableServiceWorker,
+ swPublicKey: meta.swPublickey ?? '',
+ swPrivateKey: meta.swPrivateKey ?? '',
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ enableServiceWorker: state.enableServiceWorker,
+ swPublicKey: state.swPublicKey,
+ swPrivateKey: state.swPrivateKey,
});
-}
+ fetchInstance(true);
+});
-function saveAd() {
- os.apiWithDialog('admin/update-meta', {
- notesPerOneAd: notesPerOneAd.value,
- }).then(() => {
- fetchInstance(true);
+const adForm = useForm({
+ notesPerOneAd: meta.notesPerOneAd,
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ notesPerOneAd: state.notesPerOneAd,
});
-}
+ fetchInstance(true);
+});
-function saveUrlPreview() {
- os.apiWithDialog('admin/update-meta', {
- urlPreviewEnabled: urlPreviewEnabled.value,
- urlPreviewTimeout: urlPreviewTimeout.value,
- urlPreviewMaximumContentLength: urlPreviewMaximumContentLength.value,
- urlPreviewRequireContentLength: urlPreviewRequireContentLength.value,
- urlPreviewUserAgent: urlPreviewUserAgent.value,
- urlPreviewSummaryProxyUrl: urlPreviewSummaryProxyUrl.value,
- }).then(() => {
- fetchInstance(true);
+const urlPreviewForm = useForm({
+ urlPreviewEnabled: meta.urlPreviewEnabled,
+ urlPreviewTimeout: meta.urlPreviewTimeout,
+ urlPreviewMaximumContentLength: meta.urlPreviewMaximumContentLength,
+ urlPreviewRequireContentLength: meta.urlPreviewRequireContentLength,
+ urlPreviewUserAgent: meta.urlPreviewUserAgent ?? '',
+ urlPreviewSummaryProxyUrl: meta.urlPreviewSummaryProxyUrl ?? '',
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ urlPreviewEnabled: state.urlPreviewEnabled,
+ urlPreviewTimeout: state.urlPreviewTimeout,
+ urlPreviewMaximumContentLength: state.urlPreviewMaximumContentLength,
+ urlPreviewRequireContentLength: state.urlPreviewRequireContentLength,
+ urlPreviewUserAgent: state.urlPreviewUserAgent,
+ urlPreviewSummaryProxyUrl: state.urlPreviewSummaryProxyUrl,
});
-}
+ fetchInstance(true);
+});
function chooseProxyAccount() {
os.selectUser({ localOnly: true }).then(user => {
proxyAccount.value = user;
- proxyAccountId.value = user.id;
- saveProxyAccount();
- });
-}
-
-function saveProxyAccount() {
- os.apiWithDialog('admin/update-meta', {
- proxyAccountId: proxyAccountId.value,
- }).then(() => {
- fetchInstance(true);
+ os.apiWithDialog('admin/update-meta', {
+ proxyAccountId: user.id,
+ }).then(() => {
+ fetchInstance(true);
+ });
});
}
diff --git a/packages/frontend/src/scripts/use-form.ts b/packages/frontend/src/scripts/use-form.ts
new file mode 100644
index 0000000000..0d505fe466
--- /dev/null
+++ b/packages/frontend/src/scripts/use-form.ts
@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { computed, Reactive, reactive, watch } from 'vue';
+
+function copy<T>(v: T): T {
+ return JSON.parse(JSON.stringify(v));
+}
+
+function unwrapReactive<T>(v: Reactive<T>): T {
+ return JSON.parse(JSON.stringify(v));
+}
+
+export function useForm<T extends Record<string, any>>(initialState: T, save: (newState: T) => Promise<void>) {
+ const currentState = reactive<T>(copy(initialState));
+ const previousState = reactive<T>(copy(initialState));
+
+ const modifiedStates = reactive<Record<keyof T, boolean>>({} as any);
+ for (const key in currentState) {
+ modifiedStates[key] = false;
+ }
+ const modified = computed(() => Object.values(modifiedStates).some(v => v));
+ const modifiedCount = computed(() => Object.values(modifiedStates).filter(v => v).length);
+
+ watch([currentState, previousState], () => {
+ for (const key in modifiedStates) {
+ modifiedStates[key] = currentState[key] !== previousState[key];
+ }
+ }, { deep: true });
+
+ async function _save() {
+ await save(unwrapReactive(currentState));
+ for (const key in currentState) {
+ previousState[key] = copy(currentState[key]);
+ }
+ }
+
+ function discard() {
+ for (const key in currentState) {
+ currentState[key] = copy(previousState[key]);
+ }
+ }
+
+ return {
+ state: currentState,
+ savedState: previousState,
+ modifiedStates,
+ modified,
+ modifiedCount,
+ save: _save,
+ discard,
+ };
+}
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index caaf9fca6f..5e19447120 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -378,6 +378,16 @@ rt {
vertical-align: top;
}
+._modified {
+ margin-left: 0.7em;
+ font-size: 65%;
+ padding: 2px 3px;
+ color: var(--warn);
+ border: solid 1px var(--warn);
+ border-radius: 4px;
+ vertical-align: top;
+}
+
._table {
> ._row {
display: flex;