Merge pull request #1570 from nextcloud/enh/move-photos-to-different-…

…face
nextcloud · Jan 4, 2023 · 9a331f2 · 9a331f2
2 parents 1c748c3 + dfd7f3b
commit 9a331f2
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 9 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-4e283b.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-4e283b.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-4e283b.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-4e283b.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/src/views/FaceContent.vue b/src/views/FaceContent.vue
@@ -96,6 +96,13 @@
 							<Star slot="icon" />
 							{{ t('photos', 'Remove from favorites') }}
 						</NcActionButton>
+						<NcActionButton :close-after-click="true"
+							@click="showMoveModal = true">
+							<template #icon>
+								<AccountSwitch />
+							</template>
+							{{ n('photos', 'Move photo to a different person', 'Move photos to a different person', selectedFileIds.length) }}
+						</NcActionButton>
 						<NcActionButton :close-after-click="true"
 							@click="handleRemoveFilesFromFace(selectedFileIds)">
 							<template #icon>
@@ -160,6 +167,11 @@
 			@close="showMergeModal = false">
 			<FaceMergeForm :first-face="faceName" @select="handleMerge($event)" />
 		</NcModal>
+		<NcModal v-if="showMoveModal"
+			:title="t('photos', 'Merge person')"
+			@close="showMoveModal = false">
+			<FaceMergeForm :first-face="faceName" @select="handleMove($event, selectedFileIds)" />
+		</NcModal>
 	</div>
 </template>
 
@@ -173,6 +185,7 @@ import Download from 'vue-material-design-icons/Download'
 import Send from 'vue-material-design-icons/Send'
 import Merge from 'vue-material-design-icons/Merge'
 import ArrowLeft from 'vue-material-design-icons/ArrowLeft'
+import AccountSwitch from 'vue-material-design-icons/AccountSwitch'
 import AccountBoxMultipleOutline from 'vue-material-design-icons/AccountBoxMultipleOutline'
 
 import { NcActions, NcActionButton, NcModal, NcEmptyContent, NcButton, NcLoadingIcon } from '@nextcloud/vue'
@@ -207,6 +220,7 @@ export default {
 		NcActionButton,
 		NcModal,
 		NcButton,
+		AccountSwitch,
 	},
 
 	directives: {
@@ -230,6 +244,7 @@ export default {
 
 	data() {
 		return {
+			showMoveModal: false,
 			showMergeModal: false,
 			showRenameModal: false,
 			loadingCount: 0,
@@ -348,6 +363,18 @@ export default {
 			}
 		},
 
+		async handleMove(faceName, fileIds) {
+			try {
+				this.loadingCount++
+				await this.moveFilesToFace({ oldFace: this.faceName, faceName, fileIdsToMove: fileIds })
+				this.showMoveModal = false
+			} catch (error) {
+				logger.error(error)
+			} finally {
+				this.loadingCount--
+			}
+		},
+
 		async favoriteSelection() {
 			try {
 				this.loadingCount++