Added methods to manage users and teams in a namespace

This commit is contained in:
kolaente 2018-09-18 08:10:16 +02:00
parent c1a98dac91
commit 77285ccce0
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 342 additions and 32 deletions

View File

@ -183,4 +183,37 @@
color: rgb(74, 74, 74);
}
}
.bigbuttons{
margin-top: 0.5rem;
}
.card{
margin-bottom: 1rem;
.add-user-form, .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;
}
}
}
.users-list, .teams-list,
.users-namespace, .teams-namespace{
padding: 0 !important;
}
</style>

View File

@ -1,44 +1,193 @@
<template>
<div class="card">
<header class="card-header">
<p class="card-header-title">
Edit Namespace
</p>
</header>
<div class="card-content">
<div class="content">
<form @submit.prevent="submit()">
<div class="field">
<label class="label" for="namespacetext">Namespace Name</label>
<div class="control">
<input :class="{ 'disabled': loading}" :disabled="loading" class="input" type="text" id="namespacetext" placeholder="The namespace text is here..." v-model="namespace.name">
<div>
<div class="card">
<header class="card-header">
<p class="card-header-title">
Edit Namespace
</p>
</header>
<div class="card-content">
<div class="content">
<form @submit.prevent="submit()">
<div class="field">
<label class="label" for="namespacetext">Namespace Name</label>
<div class="control">
<input :class="{ 'disabled': loading}" :disabled="loading" class="input" type="text" id="namespacetext" placeholder="The namespace text is here..." v-model="namespace.name">
</div>
</div>
</div>
<div class="field">
<label class="label" for="namespacedescription">Description</label>
<div class="control">
<textarea :class="{ 'disabled': loading}" :disabled="loading" class="textarea" placeholder="The namespaces description goes here..." id="namespacedescription" v-model="namespace.description"></textarea>
<div class="field">
<label class="label" for="namespacedescription">Description</label>
<div class="control">
<textarea :class="{ 'disabled': loading}" :disabled="loading" class="textarea" placeholder="The namespaces description goes here..." id="namespacedescription" v-model="namespace.description"></textarea>
</div>
</div>
</div>
</form>
</form>
<div class="columns bigbuttons">
<div class="column">
<button @click="submit()" class="button is-success is-fullwidth" :class="{ 'is-loading': loading}">
Save
</button>
</div>
<div class="column is-1">
<button @click="showDeleteModal = true" class="button is-danger is-fullwidth" :class="{ 'is-loading': loading}">
<span class="icon is-small">
<icon icon="trash-alt"/>
</span>
</button>
<div class="columns bigbuttons">
<div class="column">
<button @click="submit()" class="button is-success is-fullwidth" :class="{ 'is-loading': loading}">
Save
</button>
</div>
<div class="column is-1">
<button @click="showDeleteModal = true" class="button is-danger is-fullwidth" :class="{ 'is-loading': loading}">
<span class="icon is-small">
<icon icon="trash-alt"/>
</span>
</button>
</div>
</div>
</div>
</div>
</div>
<div class="card">
<header class="card-header">
<p class="card-header-title">
Users with access to this namespace
</p>
</header>
<div class="card-content content users-namespace">
<form @submit.prevent="addUser()" class="add-user-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="newUser.user_id" type="text" placeholder="Add a new user...">
<span class="icon is-small is-left">
<icon icon="user"/>
</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="u in namespaceUsers" :key="u.id">
<td>{{u.username}}</td>
<td>
<template v-if="u.id === user.infos.id">
<b class="is-success">You</b>
</template>
</td>
<td class="type">
<template v-if="u.admin">
<span class="icon is-small">
<icon icon="lock"/>
</span>
Admin
</template>
<template v-else>
<span class="icon is-small">
<icon icon="user"/>
</span>
Member
</template>
</td>
<td class="actions" v-if="userIsAdmin">
<button @click="toggleUserType(u.id, (u.right === 2))" class="button buttonright is-primary" v-if="u.id !== user.infos.id">
Make
<template v-if="u.right === 2">
Admin
</template>
<template v-else>
Member
</template>
</button>
<button @click="userToDelete = u.id; showUserDeleteModal = true" class="button is-danger" v-if="u.id !== user.infos.id">
<span class="icon is-small">
<icon icon="trash-alt"/>
</span>
</button>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="card">
<header class="card-header">
<p class="card-header-title">
Teams with access to this namespace
</p>
</header>
<div class="card-content content teams-namespace">
<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 namespaceTeams" :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
v-if="showDeleteModal"
@close="showDeleteModal = false"
@ -47,6 +196,26 @@
<p slot="text">Are you sure you want to delete this namespace and all of its contents?
<br/>This includes lists & tasks and <b>CANNOT BE UNDONE!</b></p>
</modal>
<!-- User delete modal -->
<modal
v-if="showUserDeleteModal"
@close="showUserDeleteModal = false"
v-on:submit="deleteUser()">
<span slot="header">Remove a user from the namespace</span>
<p slot="text">Are you sure you want to remove this user from the namespace?<br/>
<b>This CANNOT BE UNDONE!</b></p>
</modal>
<!-- Team delete modal -->
<modal
v-if="showTeamDeleteModal"
@close="showTeamDeleteModal = false"
v-on:submit="deleteTeam()">
<span slot="header">Remove a team from the namespace</span>
<p slot="text">Are you sure you want to remove this team from the namespace?<br/>
<b>This CANNOT BE UNDONE!</b></p>
</modal>
</div>
</template>
@ -64,6 +233,18 @@
error: '',
loading: false,
showDeleteModal: false,
user: auth.user,
userIsAdmin: false,
namespaceUsers: [],
newUser: {user_id: 0},
showUserDeleteModal: false,
userToDelete: 0,
namespaceTeams: [],
newTeam: {team_id: 0},
showTeamDeleteModal: false,
teamToDelete: 0,
}
},
beforeMount() {
@ -86,6 +267,11 @@
HTTP.get(`namespaces/` + this.$route.params.id, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
.then(response => {
this.$set(this, 'namespace', response.data)
if (response.data.owner.id === this.user.infos.id) {
this.userIsAdmin = true
}
this.loadUsers()
this.loadTeams()
this.loading = false
})
.catch(e => {
@ -120,6 +306,97 @@
this.handleError(e)
})
},
loadUsers() {
HTTP.get(`namespaces/` + this.$route.params.id + `/users`, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
.then(response => {
response.data.push(this.namespace.owner)
this.$set(this, 'namespaceUsers', response.data)
this.loading = false
})
.catch(e => {
this.handleError(e)
})
},
deleteUser() {
HTTP.delete(`namespaces/` + this.$route.params.id + `/users/` + this.userToDelete, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
.then(() => {
this.showUserDeleteModal = false;
this.handleSuccess({message: 'The user was successfully deleted from the namespace.'})
this.loadUsers()
})
.catch(e => {
this.handleError(e)
})
},
addUser(admin) {
if(admin === null) {
admin = false
}
this.newUser.right = 0
if (admin) {
this.newUser.right = 2
}
HTTP.put(`namespaces/` + this.$route.params.id + `/users`, this.newUser, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
.then(() => {
this.loadUsers()
this.handleSuccess({message: 'The user was successfully added.'})
})
.catch(e => {
this.handleError(e)
})
},
toggleUserType(userid, current) {
this.userToDelete = userid
this.newUser.user_id = userid
this.deleteUser()
this.addUser(!current)
},
loadTeams() {
HTTP.get(`namespaces/` + this.$route.params.id + `/teams`, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
.then(response => {
this.$set(this, 'namespaceTeams', response.data)
this.loading = false
})
.catch(e => {
this.handleError(e)
})
},
deleteTeam() {
HTTP.delete(`namespaces/` + 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 namespace.'})
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(`namespaces/` + 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) {
this.loading = false
message.error(e, this)