From 3a105024c7fd65c3928eed069aa8a35abd974d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 6 May 2023 07:06:12 +0900
Subject: [PATCH] =?UTF-8?q?enhance:=20=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E8=A8=AD=E5=AE=9A=E3=80=8C=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E6=83=85=E5=A0=B1=E3=80=8D=E3=81=AE=E4=B8=A6=E3=81=B3=E6=9B=BF?=
 =?UTF-8?q?=E3=81=88=E3=83=BB=E5=89=8A=E9=99=A4=E3=81=AB=E5=AF=BE=E5=BF=9C?=
 =?UTF-8?q?=20(#10766)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* (enhance) profile fields dnd

* Update CHANGELOG.md

* Fix typo

* fix lint

* fix styles

* fix lint

* (change) style

* (fix) label

* (fix) typo

* (fix) LINT ISSUES

* (change) style

* remove unnecessary style declaration

* (fix) breakpoint
---
 CHANGELOG.md                                  |   1 +
 locales/ja-JP.yml                             |   1 +
 .../frontend/src/pages/settings/profile.vue   | 116 +++++++++++++++---
 3 files changed, 103 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f55d706ec..900f0992d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 - 新しい実績を追加
 - Fix: AiScript APIのMk:dialogで何も返していなかったのをNULLを返すように修正
 - Fix: リアクションをホバーした時のユーザーリストで猫耳が切れてしまっていた問題を修正
+- プロフィール設定「追加情報」の項目の削除と並び替えができるように
 
 ### Server
 - channel/searchのqueryが空の場合に全てのチャンネルを返すように変更
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 92cbfc7d6..2376f8b06 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -560,6 +560,7 @@ accountDeletedDescription: "このアカウントは削除されています。"
 menu: "メニュー"
 divider: "分割線"
 addItem: "項目を追加"
+rearrange: "並び替え"
 relays: "リレー"
 addRelay: "リレーの追加"
 inboxUrl: "inboxのURL"
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index db21cf49d..6ffd68261 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -37,19 +37,40 @@
 			<template #icon><i class="ti ti-list"></i></template>
 			<template #label>{{ i18n.ts._profile.metadataEdit }}</template>
 
-			<div class="_gaps_m">
-				<div>
+			<div :class="$style.metadataRoot">
+				<div :class="$style.metadataMargin">
 					<MkButton :disabled="fields.length >= 16" inline style="margin-right: 8px;" @click="addField"><i class="ti ti-plus"></i> {{ i18n.ts.add }}</MkButton>
+					<MkButton v-if="!fieldEditMode" :disabled="fields.length <= 1" inline danger style="margin-right: 8px;" @click="fieldEditMode = !fieldEditMode"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+					<MkButton v-else inline style="margin-right: 8px;" @click="fieldEditMode = !fieldEditMode"><i class="ti ti-arrows-sort"></i> {{ i18n.ts.rearrange }}</MkButton>
 					<MkButton inline primary @click="saveFields"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
 				</div>
-				<FormSplit v-for="(record, i) in fields" :min-width="250">
-					<MkInput v-model="record.name" small>
-						<template #label>{{ i18n.ts._profile.metadataLabel }} #{{ i + 1 }}</template>
-					</MkInput>
-					<MkInput v-model="record.value" small>
-						<template #label>{{ i18n.ts._profile.metadataContent }} #{{ i + 1 }}</template>
-					</MkInput>
-				</FormSplit>
+
+				<Sortable
+					v-model="fields"
+					class="_gaps_s"
+					item-key="id"
+					:animation="150"
+					:handle="'.' + $style.dragItemHandle"
+					@start="e => e.item.classList.add('active')"
+					@end="e => e.item.classList.remove('active')"
+				>
+					<template #item="{element, index}">
+						<div :class="$style.fieldDragItem">
+							<button v-if="!fieldEditMode" class="_button" :class="$style.dragItemHandle" tabindex="-1"><i class="ti ti-menu"></i></button>
+							<button v-if="fieldEditMode" :disabled="fields.length <= 1" class="_button" :class="$style.dragItemRemove" @click="deleteField(index)"><i class="ti ti-x"></i></button>
+							<div :class="$style.dragItemForm">
+								<FormSplit :min-width="200">
+									<MkInput v-model="element.name" small>
+										<template #label>{{ i18n.ts._profile.metadataLabel }}</template>
+									</MkInput>
+									<MkInput v-model="element.value" small>
+										<template #label>{{ i18n.ts._profile.metadataContent }}</template>
+									</MkInput>
+								</FormSplit>
+							</div>
+						</div>
+					</template>
+				</Sortable>
 			</div>
 		</MkFolder>
 		<template #caption>{{ i18n.ts._profile.metadataDescription }}</template>
@@ -76,7 +97,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, reactive, watch } from 'vue';
+import { computed, reactive, ref, watch, defineAsyncComponent, onMounted, onUnmounted } from 'vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
@@ -94,6 +115,8 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { claimAchievement } from '@/scripts/achievements';
 import { defaultStore } from '@/store';
 
+const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
+
 const reactionAcceptance = computed(defaultStore.makeGetterSetter('reactionAcceptance'));
 
 const profile = reactive({
@@ -113,22 +136,28 @@ watch(() => profile, () => {
 	deep: true,
 });
 
-const fields = reactive($i.fields.map(field => ({ name: field.name, value: field.value })));
+const fields = ref($i?.fields.map(field => ({ id: Math.random().toString(), name: field.name, value: field.value })) ?? []);
+const fieldEditMode = ref(false);
 
 function addField() {
-	fields.push({
+	fields.value.push({
+		id: Math.random().toString(),
 		name: '',
 		value: '',
 	});
 }
 
-while (fields.length < 4) {
+while (fields.value.length < 4) {
 	addField();
 }
 
+function deleteField(index: number) { 
+	fields.value.splice(index, 1);
+}
+
 function saveFields() {
 	os.apiWithDialog('i/update', {
-		fields: fields.filter(field => field.name !== '' && field.value !== ''),
+		fields: fields.value.filter(field => field.name !== '' && field.value !== '').map(field => ({ name: field.name, value: field.value })),
 	});
 }
 
@@ -248,3 +277,60 @@ definePageMetadata({
 	}
 }
 </style>
+<style lang="scss" module>
+.metadataRoot {
+	container-type: inline-size;
+}
+
+.metadataMargin {
+	margin-bottom: 1.5em;
+}
+
+.fieldDragItem {
+	display: flex;
+	padding-bottom: .75em;
+	align-items: flex-end;
+	border-bottom: solid 0.5px var(--divider);
+
+	&:last-child {
+		border-bottom: 0;
+	}
+
+	/* (drag button) 32px + (drag button margin) 8px + (input width) 200px * 2 + (input gap) 12px = 452px */
+	@container (max-width: 452px) {
+		align-items: center;
+	}
+}
+
+.dragItemHandle {
+	cursor: grab;
+	width: 32px;
+	height: 32px;
+	margin: 0 8px 0 0;
+	opacity: 0.5;
+	flex-shrink: 0;
+
+	&:active {
+		cursor: grabbing;
+	}
+}
+
+.dragItemRemove {
+	@extend .dragItemHandle;
+
+	color: #ff2a2a;
+	opacity: 1;
+	cursor: pointer;
+
+	&:hover, &:focus {
+		opacity: .7;
+	}
+	&:active {
+		cursor: pointer;
+	}
+}
+
+.dragItemForm {
+	flex-grow: 1;
+}
+</style>