Moved namespace sharing handling to component
This commit is contained in:
kolaente
parent
9cd30e4dc0
commit
27d49e5df9
1 changed files with 10 additions and 274 deletions
|
|
@ -41,158 +41,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card">
|
<manageusers :id="namespace.id" type="namespace" :userIsAdmin="userIsAdmin" />
|
||||||
|
|
||||||
<header class="card-header">
|
<manageteams :id="namespace.id" type="namespace" :userIsAdmin="userIsAdmin" />
|
||||||
<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.right === 2">
|
|
||||||
<span class="icon is-small">
|
|
||||||
<icon icon="lock"/>
|
|
||||||
</span>
|
|
||||||
Admin
|
|
||||||
</template>
|
|
||||||
<template v-else-if="u.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="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">
|
|
||||||
Member
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
Admin
|
|
||||||
</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
|
<modal
|
||||||
v-if="showDeleteModal"
|
v-if="showDeleteModal"
|
||||||
|
|
@ -202,26 +53,6 @@
|
||||||
<p slot="text">Are you sure you want to delete this namespace and all of its contents?
|
<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>
|
<br/>This includes lists & tasks and <b>CANNOT BE UNDONE!</b></p>
|
||||||
</modal>
|
</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>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -230,6 +61,8 @@
|
||||||
import router from '../../router'
|
import router from '../../router'
|
||||||
import {HTTP} from '../../http-common'
|
import {HTTP} from '../../http-common'
|
||||||
import message from '../../message'
|
import message from '../../message'
|
||||||
|
import manageusers from '../sharing/user'
|
||||||
|
import manageteams from '../sharing/team'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "EditNamespace",
|
name: "EditNamespace",
|
||||||
|
|
@ -241,23 +74,19 @@
|
||||||
showDeleteModal: false,
|
showDeleteModal: false,
|
||||||
user: auth.user,
|
user: auth.user,
|
||||||
userIsAdmin: false,
|
userIsAdmin: false,
|
||||||
|
|
||||||
namespaceUsers: [],
|
|
||||||
newUser: {user_id: 0},
|
|
||||||
showUserDeleteModal: false,
|
|
||||||
userToDelete: 0,
|
|
||||||
|
|
||||||
namespaceTeams: [],
|
|
||||||
newTeam: {team_id: 0},
|
|
||||||
showTeamDeleteModal: false,
|
|
||||||
teamToDelete: 0,
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
components: {
|
||||||
|
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
|
||||||
if (!auth.user.authenticated) {
|
if (!auth.user.authenticated) {
|
||||||
router.push({name: 'home'})
|
router.push({name: 'home'})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.namespace.id = this.$route.params.id
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.loadNamespace()
|
this.loadNamespace()
|
||||||
|
|
@ -276,8 +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.loadUsers()
|
|
||||||
this.loadTeams()
|
|
||||||
this.loading = false
|
this.loading = false
|
||||||
})
|
})
|
||||||
.catch(e => {
|
.catch(e => {
|
||||||
|
|
@ -312,97 +139,6 @@
|
||||||
this.handleError(e)
|
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) {
|
handleError(e) {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
message.error(e, this)
|
message.error(e, this)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue