Added Delete file confirmation setting

Author: andrey18106

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.1.6 - 2021-10-21]
+## [0.1.6 - 2021-10-22]
+
+### Added
+
+- Added Delete file confirmation setting (sidebar settings)
 
 ### Fixed
 

js/mediadc-main.js

@@ -257,6 +257,28 @@
  *
  */
 
+/**
+ * @copyright Copyright (c) 2021 John Molakvoæ <[email protected]>
+ *
+ * @author John Molakvoæ <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**!
  * @fileOverview Kickass library to create and place poppers near their reference elements.
  * @version 1.16.1

js/mediadc-main.js.LICENSE.txt

@@ -74,37 +74,45 @@ export default {
 	computed: {
 		...mapGetters([
 			'detailsGridSize',
+			'deleteFileConfirmation',
 		]),
 	},
 	methods: {
 		deleteGroupFile(file) {
-			if (confirm(t('mediadc', 'Are you sure, you want delete this file?'))) {
-				this.$emit('update:updating', true)
-				axios.delete(generateUrl(`/apps/mediadc/api/v1/tasks/${file.taskId}/files/${file.detailId}/${file.fileid}`))
-					.then(res => {
-						if (res.data.success) {
-							const files = this.files
-							const fileidIndex = files.findIndex(f => f.fileid === file.fileid)
-							files.splice(fileidIndex, 1)
-							this.$emit('update:files', files)
-							emit('updateTaskInfo')
-							this.$store.dispatch('setTask', res.data.task).then(() => {
-								this.$emit('update:updating', false)
-							})
-						} else if ('locked' in res.data && res.data.locked) {
-							showWarning(t('mediadc', 'Wait until file loaded before deleting'))
-							this.$emit('update:updating', false)
-						} else {
-							showError(t('mediadc', 'Some error occured while deleting file'))
+			if (this.deleteFileConfirmation) {
+				if (confirm(t('mediadc', 'Are you sure, you want delete this file?'))) {
+					this._deleteGroupFile(file)
+				}
+			} else {
+				this._deleteGroupFile(file)
+			}
+		},
+		_deleteGroupFile(file) {
+			this.$emit('update:updating', true)
+			axios.delete(generateUrl(`/apps/mediadc/api/v1/tasks/${file.taskId}/files/${file.detailId}/${file.fileid}`))
+				.then(res => {
+					if (res.data.success) {
+						const files = this.files
+						const fileidIndex = files.findIndex(f => f.fileid === file.fileid)
+						files.splice(fileidIndex, 1)
+						this.$emit('update:files', files)
+						emit('updateTaskInfo')
+						this.$store.dispatch('setTask', res.data.task).then(() => {
 							this.$emit('update:updating', false)
-						}
-					})
-					.catch(err => {
-						console.debug(err)
+						})
+					} else if ('locked' in res.data && res.data.locked) {
+						showWarning(t('mediadc', 'Wait until file loaded before deleting'))
+						this.$emit('update:updating', false)
+					} else {
 						showError(t('mediadc', 'Some error occured while deleting file'))
 						this.$emit('update:updating', false)
-					})
-			}
+					}
+				})
+				.catch(err => {
+					console.debug(err)
+					showError(t('mediadc', 'Some error occured while deleting file'))
+					this.$emit('update:updating', false)
+				})
 		},
 	},
 }

js/mediadc-main.js.map

@@ -32,53 +32,68 @@
 				type="number"
 				min="1"
 				max="20"
-				style="width: 60px;"
-				@change="updateDetailsListItemsPerPage">
+				style="width: 60px;">
 		</div>
 		<div class="setting">
 			<label for="details-grid-setting">{{ t('mediadc', 'Group file size') }}</label>
 			<select id="details-grid-setting"
 				v-model="selectedSize"
-				name="details-grid-setting"
-				@change="updateGridSize">
+				name="details-grid-setting">
 				<option v-for="size in gridSizes" :key="size" :value="size">
 					{{ size }}px
 				</option>
 			</select>
 		</div>
+		<div class="setting">
+			<CheckboxRadioSwitch :checked.sync="deleteFileConfirmation">
+				{{ t('mediadc', 'Delete file confirmation') }}
+			</CheckboxRadioSwitch>
+		</div>
 	</div>
 </template>
 
 <script>
+import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
 
 export default {
 	name: 'DetailsListSettings',
+	components: {
+		CheckboxRadioSwitch,
+	},
 	data() {
 		return {
+			loading: true,
 			gridSizes: [128, 192, 256, 512, 768],
 			selectedSize: 192,
 			detailsListItemPerPage: 10,
+			deleteFileConfirmation: true,
 		}
 	},
+	watch: {
+		selectedSize() {
+			window.localStorage.setItem('mediadc_details_files_grid_size', this.selectedSize)
+			this.$store.dispatch('setDetailsGridSize', this.selectedSize)
+		},
+		detailsListItemPerPage() {
+			window.localStorage.setItem('mediadc_details_list_items_per_page', this.detailsListItemPerPage)
+			this.$store.dispatch('setDetailsListItemsPerPage', this.detailsListItemPerPage)
+		},
+		deleteFileConfirmation() {
+			window.localStorage.setItem('mediadc_delete_file_confirmation', this.deleteFileConfirmation)
+			this.$store.dispatch('setDeleteFileConfirmation', this.deleteFileConfirmation)
+		},
+	},
 	beforeMount() {
 		this.loadLocalSetting()
-		this.updateGridSize()
-		this.updateDetailsListItemsPerPage()
 	},
 	methods: {
-		updateGridSize() {
-			window.localStorage.setItem('mediadc_details_files_grid_size', this.selectedSize)
-			this.$store.dispatch('setDetailsGridSize', this.selectedSize)
-		},
 		loadLocalSetting() {
 			const localSelectedSize = window.localStorage.getItem('mediadc_details_files_grid_size')
 			const localDetailsListItemsPerPage = window.localStorage.getItem('mediadc_details_list_items_per_page')
+			const localDeleteFileConfirmation = window.localStorage.getItem('mediadc_delete_file_confirmation')
 			this.selectedSize = localSelectedSize !== null ? localSelectedSize : 192
 			this.detailsListItemPerPage = localDetailsListItemsPerPage !== null ? localDetailsListItemsPerPage : 10
-		},
-		updateDetailsListItemsPerPage() {
-			window.localStorage.setItem('mediadc_details_list_items_per_page', this.detailsListItemPerPage)
-			this.$store.dispatch('setDetailsListItemsPerPage', this.detailsListItemPerPage)
+			this.deleteFileConfirmation = localDeleteFileConfirmation !== null ? JSON.parse(localDeleteFileConfirmation) === true : true
 		},
 	},
 }

js/mediadc-node_modules_moment_locale_sync_recursive_-src_views_CollectorDetails_vue.js

@@ -27,6 +27,7 @@ import Vue from 'vue'
 const state = {
 	settings: [],
 	detailsGridSize: 192,
+	deleteFileConfirmation: true,
 }
 
 const mutations = {
@@ -52,12 +53,16 @@ const mutations = {
 			Vue.set(state, 'detailsGridSize', size)
 		}
 	},
+	setDeleteFileConfirmation(state, value) {
+		Vue.set(state, 'deleteFileConfirmation', value)
+	},
 }
 
 const getters = {
 	settings: state => state.settings,
 	settingByName: state => name => state.settings.find(setting => setting.name === name),
 	detailsGridSize: state => state.detailsGridSize,
+	deleteFileConfirmation: state => state.deleteFileConfirmation,
 }
 
 const actions = {
@@ -73,6 +78,9 @@ const actions = {
 	setDetailsGridSize(context, size) {
 		context.commit('setDetailsGridSize', size)
 	},
+	setDeleteFileConfirmation(context, value) {
+		context.commit('setDeleteFileConfirmation', value)
+	},
 }
 
 export default { state, mutations, getters, actions }