Ver código fonte

feat(editSong): Started integrating confirm modal for delete

Owen Diffey 3 anos atrás
pai
commit
a2cb15ec89

+ 0 - 3
frontend/src/components/modals/Confirm.vue

@@ -22,9 +22,6 @@ import Modal from "../Modal.vue";
 
 export default {
 	components: { Modal },
-	props: {
-		confirm: { type: Object, default: () => {} }
-	},
 	computed: {
 		...mapState("modals/confirm", {
 			message: state => state.message

+ 20 - 11
frontend/src/components/modals/EditSong/index.vue

@@ -506,18 +506,26 @@
 						>
 							<i class="material-icons">visibility</i>
 						</button>
-						<quick-confirm
-							placement="left"
-							@confirm="remove(song._id)"
+						<button
+							class="
+								button
+								is-danger
+								icon-with-button
+								material-icons
+							"
+							@click.prevent="
+								confirmAction({
+									message:
+										'Removing this song will remove it from all playlists and cause a ratings recalculation.',
+									action: 'remove',
+									params: song._id
+								})
+							"
+							content="Delete Song"
+							v-tippy
 						>
-							<button
-								class="button is-danger"
-								content="Remove Song"
-								v-tippy
-							>
-								<i class="material-icons">delete</i>
-							</button>
-						</quick-confirm>
+							delete_forever
+						</button>
 					</div>
 				</div>
 			</template>
@@ -1590,6 +1598,7 @@ export default {
 			"updateSongField",
 			"updateReports"
 		]),
+		...mapActions("modals/confirm", ["updateConfirmMessage"]),
 		...mapActions("modalVisibility", ["closeModal", "openModal"])
 	}
 };

+ 1 - 5
frontend/src/pages/Admin/tabs/Songs.vue

@@ -271,11 +271,7 @@
 		<edit-song v-if="modals.editSong" song-type="songs" :key="song._id" />
 		<report v-if="modals.report" />
 		<request-song v-if="modals.requestSong" />
-		<confirm
-			v-if="modals.confirm"
-			:confirm="confirm"
-			@confirmed="handleConfirmed()"
-		/>
+		<confirm v-if="modals.confirm" @confirmed="handleConfirmed()" />
 		<floating-box
 			id="keyboardShortcutsHelper"
 			ref="keyboardShortcutsHelper"

+ 1 - 5
frontend/src/pages/Admin/tabs/Test.vue

@@ -132,11 +132,7 @@
 		</div>
 		<edit-song v-if="modals.editSong" song-type="songs" :key="song._id" />
 		<report v-if="modals.report" />
-		<confirm
-			v-if="modals.confirm"
-			:confirm="confirm"
-			@confirmed="handleConfirmed()"
-		/>
+		<confirm v-if="modals.confirm" @confirmed="handleConfirmed()" />
 	</div>
 </template>