Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HUB Terra
SMS
Frontend
Commits
63db3f2e
Commit
63db3f2e
authored
2 years ago
by
Tobias Kuhnert
Browse files
Options
Downloads
Patches
Plain Diff
progress on permission groups
parent
ff4a8c83
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!296
Merge develop for staging release
,
!225
Draft: Resolve "[Refactoring] Improve vuex store usage"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
components/PlatformBasicDataForm.vue
+12
-1
12 additions, 1 deletion
components/PlatformBasicDataForm.vue
store/permissions.ts
+32
-2
32 additions, 2 deletions
store/permissions.ts
with
44 additions
and
3 deletions
components/PlatformBasicDataForm.vue
+
12
−
1
View file @
63db3f2e
...
@@ -36,6 +36,14 @@ permissions and limitations under the Licence.
...
@@ -36,6 +36,14 @@ permissions and limitations under the Licence.
ref=
"basicForm"
ref=
"basicForm"
@
submit.prevent
@
submit.prevent
>
>
<v-row>
<v-col>
<v-autocomplete
label=
"Permission groups"
:items=
"userGroups"
></v-autocomplete>
</v-col>
</v-row>
<v-row>
<v-row>
<v-col
cols=
"12"
md=
"6"
>
<v-col
cols=
"12"
md=
"6"
>
<v-text-field
<v-text-field
...
@@ -192,8 +200,11 @@ import { Status } from '@/models/Status'
...
@@ -192,8 +200,11 @@ import { Status } from '@/models/Status'
import
{
Manufacturer
}
from
'
@/models/Manufacturer
'
import
{
Manufacturer
}
from
'
@/models/Manufacturer
'
import
{
createPlatformUrn
}
from
'
@/modelUtils/urnBuilders
'
import
{
createPlatformUrn
}
from
'
@/modelUtils/urnBuilders
'
import
{
mapGetters
,
mapState
}
from
'
vuex
'
@
Component
@
Component
({
computed
:
mapGetters
(
'
permissions
'
,[
'
userGroups
'
])
})
export
default
class
PlatformBasicDataForm
extends
mixins
(
Rules
)
{
export
default
class
PlatformBasicDataForm
extends
mixins
(
Rules
)
{
private
states
:
Status
[]
=
[]
private
states
:
Status
[]
=
[]
private
manufacturers
:
Manufacturer
[]
=
[]
private
manufacturers
:
Manufacturer
[]
=
[]
...
...
This diff is collapsed.
Click to expand it.
store/permissions.ts
+
32
−
2
View file @
63db3f2e
import
{
Api
}
from
'
@/services/Api
'
import
{
Api
}
from
'
@/services/Api
'
import
{
Commit
}
from
'
vuex
'
import
{
Commit
,
GetterTree
}
from
'
vuex
'
import
{
UserInfo
}
from
'
@/models/UserInfo
'
import
{
UserInfo
}
from
'
@/models/UserInfo
'
import
{
PermissionGroup
}
from
'
@/models/PermissionGroup
'
import
{
PermissionGroup
}
from
'
@/models/PermissionGroup
'
...
@@ -13,7 +13,37 @@ const state = (): permissionsState => ({
...
@@ -13,7 +13,37 @@ const state = (): permissionsState => ({
permissionGroups
:
[]
permissionGroups
:
[]
})
})
const
getters
=
{}
const
getters
=
{
memberedPermissionGroups
:(
state
:
permissionsState
)
=>
{
if
(
state
.
userInfo
!==
null
){
const
memberMappedIds
=
state
.
userInfo
.
member
.
map
(
groupId
=>
groupId
.
split
(
'
/
'
).
pop
())
// return state.permissionGroups.filter(group => state.userInfo!.isMemberOf(group))
return
state
.
permissionGroups
.
filter
((
group
)
=>
{
return
memberMappedIds
.
find
(
groupId
=>
groupId
===
group
.
id
)
})
}
return
[]
},
administradedPermissionGroups
:(
state
:
permissionsState
)
=>
{
if
(
state
.
userInfo
!==
null
){
const
administratedMappedIds
=
state
.
userInfo
.
admin
.
map
(
groupId
=>
groupId
.
split
(
'
/
'
).
pop
())
return
state
.
permissionGroups
.
filter
((
group
)
=>
{
return
administratedMappedIds
.
find
(
groupId
=>
groupId
===
group
.
id
)
})
}
return
[]
// return state.permissionGroups.filter(group => state.userInfo?.isAdminOf(group))
},
userGroups
:(
state
:
permissionsState
,
getters
:
any
)
=>
{
if
(
state
.
userInfo
){
return
[...
new
Set
(
[...
getters
.
memberedPermissionGroups
,
...
getters
.
administradedPermissionGroups
]
)
]
}
return
[]
}
}
// @ts-ignore
// @ts-ignore
const
actions
:
{
const
actions
:
{
[
key
:
string
]:
any
;
[
key
:
string
]:
any
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment