Moved handling team sharing to a seperate component
This commit is contained in:
kolaente
parent
b42f71a39a
commit
182c8bd8cb
2 changed files with 212 additions and 136 deletions
|
|
@ -43,81 +43,8 @@
|
||||||
|
|
||||||
<manageusers :id="list.id" type="list" :userIsAdmin="userIsAdmin" />
|
<manageusers :id="list.id" type="list" :userIsAdmin="userIsAdmin" />
|
||||||
|
|
||||||
<div class="card">
|
<manageteams :id="list.id" type="list" :userIsAdmin="userIsAdmin" />
|
||||||
|
|
||||||
<header class="card-header">
|
|
||||||
<p class="card-header-title">
|
|
||||||
Teams with access to this list
|
|
||||||
</p>
|
|
||||||
</header>
|
|
||||||
<div class="card-content content teams-list">
|
|
||||||
<form @submit.prevent="addTeam()" class="add-team-form" v-if="userIsAdmin">
|
|
||||||
<div class="field is-grouped">
|
|
||||||
<p class="control has-icons-left is-expanded" v-bind:class="{ 'is-loading': loading}">
|
|
||||||
<input class="input" v-bind:class="{ 'disabled': loading}" v-model.number="newTeam.team_id" type="text" placeholder="Add a new team...">
|
|
||||||
<span class="icon is-small is-left">
|
|
||||||
<icon icon="users"/>
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
<p class="control">
|
|
||||||
<button type="submit" class="button is-success">
|
|
||||||
<span class="icon is-small">
|
|
||||||
<icon icon="plus"/>
|
|
||||||
</span>
|
|
||||||
Add
|
|
||||||
</button>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
<table class="table is-striped is-hoverable is-fullwidth">
|
|
||||||
<tbody>
|
|
||||||
<tr v-for="t in listTeams" :key="t.id">
|
|
||||||
<td>
|
|
||||||
<router-link :to="{name: 'editTeam', params: {id: t.id}}">
|
|
||||||
{{t.name}}
|
|
||||||
</router-link>
|
|
||||||
</td>
|
|
||||||
<td class="type">
|
|
||||||
<template v-if="t.right === 2">
|
|
||||||
<span class="icon is-small">
|
|
||||||
<icon icon="lock"/>
|
|
||||||
</span>
|
|
||||||
Admin
|
|
||||||
</template>
|
|
||||||
<template v-else-if="t.right === 1">
|
|
||||||
<span class="icon is-small">
|
|
||||||
<icon icon="pen"/>
|
|
||||||
</span>
|
|
||||||
Write
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<span class="icon is-small">
|
|
||||||
<icon icon="users"/>
|
|
||||||
</span>
|
|
||||||
Read-only
|
|
||||||
</template>
|
|
||||||
</td>
|
|
||||||
<td class="actions" v-if="userIsAdmin">
|
|
||||||
<button @click="toggleTeamType(t.id, (t.right === 2))" class="button buttonright is-primary">
|
|
||||||
Make
|
|
||||||
<template v-if="t.right === 2">
|
|
||||||
Member
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
Admin
|
|
||||||
</template>
|
|
||||||
</button>
|
|
||||||
<button @click="teamToDelete = t.id; showTeamDeleteModal = true" class="button is-danger">
|
|
||||||
<span class="icon is-small">
|
|
||||||
<icon icon="trash-alt"/>
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<modal
|
<modal
|
||||||
v-if="showDeleteModal"
|
v-if="showDeleteModal"
|
||||||
@close="showDeleteModal = false"
|
@close="showDeleteModal = false"
|
||||||
|
|
@ -126,16 +53,6 @@
|
||||||
<p slot="text">Are you sure you want to delete this list and all of its contents?
|
<p slot="text">Are you sure you want to delete this list and all of its contents?
|
||||||
<br/>This includes all tasks and <b>CANNOT BE UNDONE!</b></p>
|
<br/>This includes all tasks and <b>CANNOT BE UNDONE!</b></p>
|
||||||
</modal>
|
</modal>
|
||||||
|
|
||||||
<!-- Team delete modal -->
|
|
||||||
<modal
|
|
||||||
v-if="showTeamDeleteModal"
|
|
||||||
@close="showTeamDeleteModal = false"
|
|
||||||
v-on:submit="deleteTeam()">
|
|
||||||
<span slot="header">Remove a team from the list</span>
|
|
||||||
<p slot="text">Are you sure you want to remove this team from the list?<br/>
|
|
||||||
<b>This CANNOT BE UNDONE!</b></p>
|
|
||||||
</modal>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -145,6 +62,7 @@
|
||||||
import {HTTP} from '../../http-common'
|
import {HTTP} from '../../http-common'
|
||||||
import message from '../../message'
|
import message from '../../message'
|
||||||
import manageusers from '../sharing/user'
|
import manageusers from '../sharing/user'
|
||||||
|
import manageteams from '../sharing/team'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "EditList",
|
name: "EditList",
|
||||||
|
|
@ -156,15 +74,11 @@
|
||||||
showDeleteModal: false,
|
showDeleteModal: false,
|
||||||
user: auth.user,
|
user: auth.user,
|
||||||
userIsAdmin: false,
|
userIsAdmin: false,
|
||||||
|
|
||||||
listTeams: [],
|
|
||||||
newTeam: {team_id: 0},
|
|
||||||
showTeamDeleteModal: false,
|
|
||||||
teamToDelete: 0,
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
manageusers
|
manageusers,
|
||||||
|
manageteams,
|
||||||
},
|
},
|
||||||
beforeMount() {
|
beforeMount() {
|
||||||
// Check if the user is already logged in, if so, redirect him to the homepage
|
// Check if the user is already logged in, if so, redirect him to the homepage
|
||||||
|
|
@ -191,7 +105,6 @@
|
||||||
if (response.data.owner.id === this.user.infos.id) {
|
if (response.data.owner.id === this.user.infos.id) {
|
||||||
this.userIsAdmin = true
|
this.userIsAdmin = true
|
||||||
}
|
}
|
||||||
this.loadTeams()
|
|
||||||
this.loading = false
|
this.loading = false
|
||||||
})
|
})
|
||||||
.catch(e => {
|
.catch(e => {
|
||||||
|
|
@ -228,51 +141,6 @@
|
||||||
this.handleError(e)
|
this.handleError(e)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
loadTeams() {
|
|
||||||
HTTP.get(`lists/` + this.$route.params.id + `/teams`, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
|
|
||||||
.then(response => {
|
|
||||||
this.$set(this, 'listTeams', response.data)
|
|
||||||
this.loading = false
|
|
||||||
})
|
|
||||||
.catch(e => {
|
|
||||||
this.handleError(e)
|
|
||||||
})
|
|
||||||
},
|
|
||||||
deleteTeam() {
|
|
||||||
HTTP.delete(`lists/` + this.$route.params.id + `/teams/` + this.teamToDelete, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
|
|
||||||
.then(() => {
|
|
||||||
this.showTeamDeleteModal = false;
|
|
||||||
this.handleSuccess({message: 'The team was successfully deleted from the list.'})
|
|
||||||
this.loadTeams()
|
|
||||||
})
|
|
||||||
.catch(e => {
|
|
||||||
this.handleError(e)
|
|
||||||
})
|
|
||||||
},
|
|
||||||
addTeam(admin) {
|
|
||||||
if(admin === null) {
|
|
||||||
admin = false
|
|
||||||
}
|
|
||||||
this.newTeam.right = 0
|
|
||||||
if (admin) {
|
|
||||||
this.newTeam.right = 2
|
|
||||||
}
|
|
||||||
|
|
||||||
HTTP.put(`lists/` + this.$route.params.id + `/teams`, this.newTeam, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
|
|
||||||
.then(() => {
|
|
||||||
this.loadTeams()
|
|
||||||
this.handleSuccess({message: 'The team was successfully added.'})
|
|
||||||
})
|
|
||||||
.catch(e => {
|
|
||||||
this.handleError(e)
|
|
||||||
})
|
|
||||||
},
|
|
||||||
toggleTeamType(teamid, current) {
|
|
||||||
this.teamToDelete = teamid
|
|
||||||
this.newTeam.team_id = teamid
|
|
||||||
this.deleteTeam()
|
|
||||||
this.addTeam(!current)
|
|
||||||
},
|
|
||||||
handleError(e) {
|
handleError(e) {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
message.error(e, this)
|
message.error(e, this)
|
||||||
|
|
|
||||||
208
src/components/sharing/team.vue
Normal file
208
src/components/sharing/team.vue
Normal file
|
|
@ -0,0 +1,208 @@
|
||||||
|
<template>
|
||||||
|
<div class="card">
|
||||||
|
|
||||||
|
<header class="card-header">
|
||||||
|
<p class="card-header-title">
|
||||||
|
Teams with access to this {{typeString}}
|
||||||
|
</p>
|
||||||
|
</header>
|
||||||
|
<div class="card-content content teams-list">
|
||||||
|
<form @submit.prevent="addTeam()" class="add-team-form" v-if="userIsAdmin">
|
||||||
|
<div class="field is-grouped">
|
||||||
|
<p class="control has-icons-left is-expanded" v-bind:class="{ 'is-loading': loading}">
|
||||||
|
<input class="input" v-bind:class="{ 'disabled': loading}" v-model.number="newTeam.team_id" type="text" placeholder="Add a new team...">
|
||||||
|
<span class="icon is-small is-left">
|
||||||
|
<icon icon="users"/>
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
<p class="control">
|
||||||
|
<button type="submit" class="button is-success">
|
||||||
|
<span class="icon is-small">
|
||||||
|
<icon icon="plus"/>
|
||||||
|
</span>
|
||||||
|
Add
|
||||||
|
</button>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<table class="table is-striped is-hoverable is-fullwidth">
|
||||||
|
<tbody>
|
||||||
|
<tr v-for="t in listTeams" :key="t.id">
|
||||||
|
<td>
|
||||||
|
<router-link :to="{name: 'editTeam', params: {id: t.id}}">
|
||||||
|
{{t.name}}
|
||||||
|
</router-link>
|
||||||
|
</td>
|
||||||
|
<td class="type">
|
||||||
|
<template v-if="t.right === 2">
|
||||||
|
<span class="icon is-small">
|
||||||
|
<icon icon="lock"/>
|
||||||
|
</span>
|
||||||
|
Admin
|
||||||
|
</template>
|
||||||
|
<template v-else-if="t.right === 1">
|
||||||
|
<span class="icon is-small">
|
||||||
|
<icon icon="pen"/>
|
||||||
|
</span>
|
||||||
|
Write
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<span class="icon is-small">
|
||||||
|
<icon icon="users"/>
|
||||||
|
</span>
|
||||||
|
Read-only
|
||||||
|
</template>
|
||||||
|
</td>
|
||||||
|
<td class="actions" v-if="userIsAdmin">
|
||||||
|
<button @click="toggleTeamType(t.id, (t.right === 2))" class="button buttonright is-primary">
|
||||||
|
Make
|
||||||
|
<template v-if="t.right === 2">
|
||||||
|
Member
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
Admin
|
||||||
|
</template>
|
||||||
|
</button>
|
||||||
|
<button @click="teamToDelete = t.id; showTeamDeleteModal = true" class="button is-danger">
|
||||||
|
<span class="icon is-small">
|
||||||
|
<icon icon="trash-alt"/>
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<modal
|
||||||
|
v-if="showTeamDeleteModal"
|
||||||
|
@close="showTeamDeleteModal = false"
|
||||||
|
v-on:submit="deleteTeam()">
|
||||||
|
<span slot="header">Remove a team from the {{typeString}}</span>
|
||||||
|
<p slot="text">Are you sure you want to remove this team from the {{typeString}}?<br/>
|
||||||
|
<b>This CANNOT BE UNDONE!</b></p>
|
||||||
|
</modal>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {HTTP} from '../../http-common'
|
||||||
|
import auth from '../../auth'
|
||||||
|
import message from '../../message'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'team',
|
||||||
|
props: {
|
||||||
|
type: '',
|
||||||
|
id: 0,
|
||||||
|
userIsAdmin: false,
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
loading: false,
|
||||||
|
currentUser: auth.user.infos,
|
||||||
|
typeString: '',
|
||||||
|
listTeams: [],
|
||||||
|
newTeam: {team_id: 0},
|
||||||
|
showTeamDeleteModal: false,
|
||||||
|
teamToDelete: 0,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
if (this.type === 'list') {
|
||||||
|
this.typeString = `list`
|
||||||
|
} else if (this.type === 'namespace') {
|
||||||
|
this.typeString = `namespace`
|
||||||
|
} else {
|
||||||
|
throw new Error('Unknown type: ' + this.type)
|
||||||
|
}
|
||||||
|
|
||||||
|
this.loadTeams()
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
loadTeams() {
|
||||||
|
HTTP.get(this.typeString + `s/` + this.id + `/teams`, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
|
||||||
|
.then(response => {
|
||||||
|
this.$set(this, 'listTeams', response.data)
|
||||||
|
this.loading = false
|
||||||
|
})
|
||||||
|
.catch(e => {
|
||||||
|
this.handleError(e)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
deleteTeam() {
|
||||||
|
HTTP.delete(this.typeString + `s/` + this.id + `/teams/` + this.teamToDelete, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
|
||||||
|
.then(() => {
|
||||||
|
this.showTeamDeleteModal = false;
|
||||||
|
this.handleSuccess({message: 'The team was successfully deleted from the ' + this.typeString + '.'})
|
||||||
|
this.loadTeams()
|
||||||
|
})
|
||||||
|
.catch(e => {
|
||||||
|
this.handleError(e)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
addTeam(admin) {
|
||||||
|
if(admin === null) {
|
||||||
|
admin = false
|
||||||
|
}
|
||||||
|
this.newTeam.right = 0
|
||||||
|
if (admin) {
|
||||||
|
this.newTeam.right = 2
|
||||||
|
}
|
||||||
|
|
||||||
|
HTTP.put(this.typeString + `s/` + this.id + `/teams`, this.newTeam, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
|
||||||
|
.then(() => {
|
||||||
|
this.loadTeams()
|
||||||
|
this.handleSuccess({message: 'The team was successfully added.'})
|
||||||
|
})
|
||||||
|
.catch(e => {
|
||||||
|
this.handleError(e)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
toggleTeamType(teamid, current) {
|
||||||
|
this.teamToDelete = teamid
|
||||||
|
this.newTeam.team_id = teamid
|
||||||
|
this.deleteTeam()
|
||||||
|
this.addTeam(!current)
|
||||||
|
},
|
||||||
|
handleError(e) {
|
||||||
|
this.loading = false
|
||||||
|
message.error(e, this)
|
||||||
|
},
|
||||||
|
handleSuccess(e) {
|
||||||
|
this.loading = false
|
||||||
|
message.success(e, this)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.card{
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
|
||||||
|
.add-team-form {
|
||||||
|
margin: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table{
|
||||||
|
border-top: 1px solid darken(#fff, 15%);
|
||||||
|
|
||||||
|
td{
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.type, td.actions{
|
||||||
|
width: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.actions{
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.teams-list, .teams-namespace{
|
||||||
|
padding: 0 !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
Loading…
Reference in a new issue