Skip to content

Commit 9b6ce98

Browse files
committed
Enable to add member
1 parent b6b4561 commit 9b6ce98

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

frontend/components/containers/members/MemberAdditionButton.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<member-addition-form
88
:add-member="addMember"
99
:items="items"
10+
:roles="roles"
1011
@close="slotProps.close"
1112
@search-user="searchUser"
1213
/>
@@ -15,7 +16,7 @@
1516
</template>
1617

1718
<script>
18-
import { mapActions } from 'vuex'
19+
import { mapActions, mapGetters } from 'vuex'
1920
import BaseModal from '@/components/molecules/BaseModal'
2021
import MemberAdditionForm from '@/components/organisms/members/MemberAdditionForm'
2122
import UserService from '@/services/user.service'
@@ -32,8 +33,17 @@ export default {
3233
}
3334
},
3435
36+
computed: {
37+
...mapGetters('roles', ['roles'])
38+
},
39+
40+
created() {
41+
this.getRoleList()
42+
},
43+
3544
methods: {
3645
...mapActions('members', ['addMember']),
46+
...mapActions('roles', ['getRoleList']),
3747
3848
searchUser(username) {
3949
UserService.getUserList(username)

frontend/components/organisms/members/MemberAdditionForm.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
:items="items"
1818
:loading="isLoading"
1919
:search-input.sync="username"
20-
:rules="userNameRules"
2120
color="white"
2221
hide-no-data
2322
hide-selected
@@ -31,7 +30,10 @@
3130
v-model="role"
3231
:items="roles"
3332
:rules="roleRules"
33+
item-text="name"
34+
item-value="id"
3435
label="Role"
36+
return-object
3537
prepend-icon="mdi-account-card-details-outline"
3638
/>
3739
</v-form>
@@ -41,7 +43,7 @@
4143

4244
<script>
4345
import BaseCard from '@/components/molecules/BaseCard'
44-
import { userNameRules, roleRules } from '@/rules/index'
46+
import { roleRules } from '@/rules/index'
4547
4648
export default {
4749
components: {
@@ -57,6 +59,11 @@ export default {
5759
type: Array,
5860
default: () => {},
5961
required: true
62+
},
63+
roles: {
64+
type: Array,
65+
default: () => {},
66+
required: true
6067
}
6168
},
6269
data() {
@@ -66,8 +73,6 @@ export default {
6673
role: null,
6774
isLoading: false,
6875
selectedUser: null,
69-
roles: ['Admin', 'Member'],
70-
userNameRules,
7176
roleRules
7277
}
7378
},
@@ -93,7 +98,7 @@ export default {
9398
this.addMember({
9499
userId: this.selectedUser.id,
95100
projectId: this.$route.params.id,
96-
role: this.role
101+
role: this.role.id
97102
})
98103
this.reset()
99104
this.cancel()

frontend/services/member.service.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ class MemberService {
99
return this.request.get(`/projects/${projectId}/roles`)
1010
}
1111

12-
addMember(projectId, userId, role) {
12+
addMember(projectId, user, role) {
1313
const data = {
14-
id: userId,
14+
user,
1515
role
1616
}
1717
return this.request.post(`/projects/${projectId}/roles`, data)

0 commit comments

Comments
 (0)