fix(Admin Management of Songs): fixed socket listeners for toggling verifying/hiding

Signed-off-by: Jonathan <theflametrooper@gmail.com>

backend/logic/actions/songs.js

@@ -20,6 +20,8 @@ CacheModule.runJob("SUB", {
 			modelName: "song"
 		});
 
+		console.log("NEW UNVERIFIED SONG");
+
 		songModel.findOne({ _id: songId }, (err, song) => {
 			WSModule.runJob("EMIT_TO_ROOM", {
 				room: "admin.unverifiedSongs",
@@ -65,6 +67,7 @@ CacheModule.runJob("SUB", {
 	cb: async songId => {
 		const songModel = await DBModule.runJob("GET_MODEL", { modelName: "song" });
 		songModel.findOne({ _id: songId }, (err, song) => {
+			console.log("NEW VERIFIED SONG");
 			WSModule.runJob("EMIT_TO_ROOM", {
 				room: "admin.songs",
 				args: ["event:admin.verifiedSong.created", { data: { song } }]
@@ -107,6 +110,9 @@ CacheModule.runJob("SUB", {
 		const songModel = await DBModule.runJob("GET_MODEL", {
 			modelName: "song"
 		});
+
+		console.log("NEW HIDDEN SONG");
+
 		songModel.findOne({ _id: songId }, (err, song) => {
 			WSModule.runJob("EMIT_TO_ROOM", {
 				room: "admin.hiddenSongs",
@@ -803,6 +809,7 @@ export default {
 					channel: "song.newVerifiedSong",
 					value: song._id
 				});
+
 				CacheModule.runJob("PUB", {
 					channel: "song.removedUnverifiedSong",
 					value: song._id

backend/logic/songs.js

@@ -975,6 +975,11 @@ class _SongsModule extends CoreClass {
 						value: songId
 					});
 
+					CacheModule.runJob("PUB", {
+						channel: "song.removedVerifiedSong",
+						value: songId
+					});
+
 					resolve();
 				}
 			);

frontend/src/pages/Admin/index.vue

@@ -122,6 +122,8 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
+
 import MainHeader from "@/components/layout/MainHeader.vue";
 
 export default {
@@ -143,6 +145,9 @@ export default {
 			currentTab: ""
 		};
 	},
+	computed: mapGetters({
+		socket: "websockets/getSocket"
+	}),
 	watch: {
 		$route(route) {
 			this.changeTab(route.path);

frontend/src/pages/Admin/tabs/HiddenSongs.vue

@@ -281,6 +281,8 @@ export default {
 			this.$refs.keyboardShortcutsHelper.resetBox();
 		},
 		init() {
+			this.resetSongs();
+
 			if (this.songs.length > 0)
 				this.position = Math.ceil(this.songs.length / 15) + 1;
 
@@ -296,6 +298,7 @@ export default {
 		},
 		...mapActions("admin/hiddenSongs", [
 			// "stopVideo",
+			"resetSongs",
 			"addSong",
 			"removeSong",
 			"updateSong"

frontend/src/pages/Admin/tabs/UnverifiedSongs.vue

@@ -299,6 +299,8 @@ export default {
 			this.$refs.keyboardShortcutsHelper.resetBox();
 		},
 		init() {
+			this.resetSongs();
+
 			if (this.songs.length > 0)
 				this.position = Math.ceil(this.songs.length / 15) + 1;
 
@@ -317,6 +319,7 @@ export default {
 		},
 		...mapActions("admin/unverifiedSongs", [
 			// "stopVideo",
+			"resetSongs",
 			"addSong",
 			"removeSong",
 			"updateSong"

frontend/src/pages/Admin/tabs/VerifiedSongs.vue

@@ -326,9 +326,10 @@ export default {
 		}
 	},
 	mounted() {
-		this.socket.on("event:admin.verifiedSong.created", res =>
-			this.addSong(res.data.song)
-		);
+		this.socket.on("event:admin.verifiedSong.created", res => {
+			this.addSong(res.data.song);
+			console.log("created");
+		});
 
 		this.socket.on("event:admin.verifiedSong.deleted", res =>
 			this.removeSong(res.data.songId)
@@ -415,6 +416,8 @@ export default {
 			this.$refs.keyboardShortcutsHelper.resetBox();
 		},
 		init() {
+			this.resetSongs();
+
 			if (this.songs.length > 0)
 				this.position = Math.ceil(this.songs.length / 15) + 1;
 
@@ -429,6 +432,7 @@ export default {
 		},
 		...mapActions("admin/verifiedSongs", [
 			// "stopVideo",
+			"resetSongs",
 			"addSong",
 			"removeSong",
 			"updateSong"

frontend/src/store/modules/admin.js

@@ -17,12 +17,16 @@ const modules = {
 		},
 		getters: {},
 		actions: {
+			resetSongs: ({ commit }) => commit("resetSongs"),
 			addSong: ({ commit }, song) => commit("addSong", song),
 			removeSong: ({ commit }, songId) => commit("removeSong", songId),
 			updateSong: ({ commit }, updatedSong) =>
 				commit("updateSong", updatedSong)
 		},
 		mutations: {
+			resetSongs(state) {
+				state.songs = [];
+			},
 			addSong(state, song) {
 				state.songs.push(song);
 			},
@@ -46,12 +50,16 @@ const modules = {
 		},
 		getters: {},
 		actions: {
+			resetSongs: ({ commit }) => commit("resetSongs"),
 			addSong: ({ commit }, song) => commit("addSong", song),
 			removeSong: ({ commit }, songId) => commit("removeSong", songId),
 			updateSong: ({ commit }, updatedSong) =>
 				commit("updateSong", updatedSong)
 		},
 		mutations: {
+			resetSongs(state) {
+				state.songs = [];
+			},
 			addSong(state, song) {
 				state.songs.push(song);
 			},
@@ -75,12 +83,16 @@ const modules = {
 		},
 		getters: {},
 		actions: {
+			resetSongs: ({ commit }) => commit("resetSongs"),
 			addSong: ({ commit }, song) => commit("addSong", song),
 			removeSong: ({ commit }, songId) => commit("removeSong", songId),
 			updateSong: ({ commit }, updatedSong) =>
 				commit("updateSong", updatedSong)
 		},
 		mutations: {
+			resetSongs(state) {
+				state.songs = [];
+			},
 			addSong(state, song) {
 				state.songs.push(song);
 			},