deleted items

Signed-off-by: Jakob <jakob.roehrl@web.de>

src/components/board/DeletedTabSidebard.vue

@@ -1,6 +1,7 @@
 <template>
 	<div>
 		<h3>{{ t('deck', 'Deleted stacks') }}</h3>
+
 		<ul>
 			<!-- <li ng-repeat="deletedStack in stackservice.deleted">
 				<span class="icon icon-deck"></span>
@@ -11,6 +12,7 @@
 		</ul>
 
 		<h3>{{ t('deck', 'Deleted cards') }}</h3>
+		{{ deletedCards }}
 		<ul>
 			<!-- <li ng-repeat="deletedCard in cardservice.deleted">
 				<span class="icon icon-deck"></span>
@@ -25,7 +27,7 @@
 </template>
 
 <script>
-
+import { mapState } from 'vuex'
 export default {
 	name: 'DeletedTabSidebard',
 	components: {
@@ -39,9 +41,33 @@ export default {
 	},
 	data() {
 		return {
+			isLoading: false
+		}
+	},
+	computed: {
+		...mapState({
+			deletedStacks: state => state.deletedStacks
+			// deletedCards: state => state.deletedCards
+		}),
+
+		deletedCards() {
+			console.log(store.state.deletedCards)
+			return store.state.deletedCards
+		}
+
+	},
+	created() {
+		this.getData()
+	},
+	methods: {
+		getData() {
+			this.isLoading = true
+
+			this.$store.dispatch('deletedItems', 1).then(response => {
+				this.isLoading = false
+			})
 		}
 	}
-
 }
 </script>
 

src/components/board/SharingTabSidebard.vue

@@ -71,22 +71,12 @@ export default {
 			sharees: 'sharees'
 		}),
 		unallocatedSharees() {
-			let ret = []
-
-			let allocatedSharees = []
-			for (var user in this.board.acl) {
-				allocatedSharees.push(this.board.acl[user].participant.uid)
-			}
-
-			this.sharees.forEach(function(sharee) {
-				if (allocatedSharees.indexOf(sharee.value.shareWith) === -1) {
-					ret.push(sharee)
-				}
+			return this.sharees.filter((sharee) => {
+				return Object.values(this.board.acl).findIndex((acl) => {
+					return acl.participant.uid === sharee.value.shareWith
+				})
 			})
-
-			return ret
 		}
-
 	},
 	methods: {
 		asyncFind(query) {

src/components/cards/CardItem.vue

@@ -159,7 +159,7 @@ export default {
 		},
 		assignCardToMe() {
 			this.copiedCard = Object.assign({}, this.card)
-			this.copiedCard.assignUser = this.card.owner.uid
+			this.copiedCard.newUserUid = this.card.owner.uid
 			this.$store.dispatch('assignCardToMe', this.copiedCard)
 		},
 		setCurrentCard() {

src/services/CardApi.js

@@ -75,7 +75,7 @@ export class CardApi {
 	}
 
 	assignUser(card) {
-		return axios.put(this.url(`/cards/${card.id}/assignUser`), card.assignUser)
+		return axios.post(this.url(`/cards/${card.id}/assignUser`), card.newUserUid)
 			.then(
 				(response) => {
 					return Promise.resolve(response.data)

src/services/StackApi.js

@@ -44,6 +44,36 @@ export class StackApi {
 			})
 	}
 
+	deletedStacks(boardId) {
+		return axios.get(this.url(`/${boardId}/stacks/deleted`))
+			.then(
+				(response) => {
+					return Promise.resolve(response.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				}
+			)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
+	deletedCards(boardId) {
+		return axios.get(this.url(`/${boardId}/cards/deleted`))
+			.then(
+				(response) => {
+					return Promise.resolve(response.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				}
+			)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
 	loadArchivedStacks(boardId) {
 		return axios.get(this.url(`/stacks/${boardId}/archived`))
 			.then(

src/store/card.js

@@ -63,7 +63,11 @@ export default {
 			}
 		},
 		assignCardToMe(state, card) {
-			// let existingIndex = state.cards.findIndex(_card => _card.id === card.id)
+			console.log(card)
+			let existingIndex = state.cards.findIndex(_card => _card.id === card.id)
+			if (existingIndex !== -1) {
+
+			}
 		}
 	},
 	actions: {

src/store/stack.js

@@ -28,7 +28,9 @@ const apiClient = new StackApi()
 
 export default {
 	state: {
-		stacks: []
+		stacks: [],
+		deletedStacks: [],
+		deletedCards: []
 	},
 	getters: {
 		stacksByBoard: state => (id) => {
@@ -64,6 +66,12 @@ export default {
 			if (existingIndex !== -1) {
 				state.stacks[existingIndex].title = stack.title
 			}
+		},
+		setDeletedStacks(state, delStacks) {
+			state.deletedStacks.push(delStacks)
+		},
+		setDeletedCards(state, delCards) {
+			state.deletedCards.push(delCards)
 		}
 	},
 	actions: {
@@ -112,6 +120,16 @@ export default {
 				.then((stack) => {
 					commit('updateStack', stack)
 				})
+		},
+		deletedItems({ commit }, boardId) {
+			apiClient.deletedStacks(boardId)
+				.then((deletedStacks) => {
+					commit('setDeletedStacks', deletedStacks)
+				})
+			apiClient.deletedCards(boardId)
+				.then((deletedCards) => {
+					commit('setDeletedCards', deletedCards)
+				})
 		}
 	}
 }