Use traits for consistent responses and avoid duplicated code

3 files changed, 6 insertions, 6 deletions

diff --git a/src/js/store/modules/subModules/comments.js b/src/js/store/modules/subModules/comments.js
index 285b87f7..ff4f7cd1 100644
--- a/src/js/store/modules/subModules/comments.js
+++ b/src/js/store/modules/subModules/comments.js
@@ -45,7 +45,7 @@ const mutations = {
 	},
 
 	add(state, payload) {
-		state.list.push(payload)
+		state.list.push(payload.comment)
 	},
 
 	delete(state, payload) {
@@ -71,7 +71,7 @@ const actions = {
 			token: context.rootState.poll.acl.token,
 		})
 			.then((response) => {
-				context.commit('add', response.data)
+				context.commit('add', { comment: response.data.comment })
 				return response.data
 			})
 			.catch((error) => {
@@ -85,11 +85,11 @@ const actions = {
 		if (context.rootState.poll.acl.token) {
 			endPoint = endPoint + '/s/' + context.rootState.poll.acl.token
 		}
-		context.commit('delete', { comment: payload.comment })
 
 		return axios.delete(generateUrl(endPoint + '/' + payload.comment.id))
 			.then((response) => {
-				context.commit('delete', { comment: response.data.comment })
+				console.debug('deleted', response.data)
+				context.commit('delete', { comment: payload.comment })
 				return response.data
 			})
 			.catch((error) => {
diff --git a/src/js/store/modules/subModules/options.js b/src/js/store/modules/subModules/options.js
index a77b787a..3b78297b 100644
--- a/src/js/store/modules/subModules/options.js
+++ b/src/js/store/modules/subModules/options.js
@@ -165,7 +165,7 @@ const actions = {
 
 		return axios.delete(generateUrl(endPoint + '/' + payload.option.id))
 			.then((response) => {
-				context.commit('delete', { option: response.data.option })
+				context.commit('delete', { option: payload.option })
 			})
 			.catch((error) => {
 				console.error('Error deleting option', { error: error.response }, { payload: payload })
diff --git a/src/js/store/modules/subModules/shares.js b/src/js/store/modules/subModules/shares.js
index ec9181c7..dc1928ca 100644
--- a/src/js/store/modules/subModules/shares.js
+++ b/src/js/store/modules/subModules/shares.js
@@ -120,7 +120,7 @@ const actions = {
 		const endPoint = 'apps/polls/share/personal'
 		return axios.post(generateUrl(endPoint), { token: payload.token, userName: payload.userName, emailAddress: payload.emailAddress })
 			.then((response) => {
-				return { token: response.data.token }
+				return { token: response.data.share.token }
 			})
 			.catch((error) => {
 				console.error('Error writing personal share', { error: error.response }, { payload: payload })