Skip to content

Commit

Permalink
Enhance
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan committed Feb 14, 2023
1 parent 8a44543 commit 1c0d7e0
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
18 changes: 18 additions & 0 deletions packages/web-app-admin-settings/src/components/Users/UsersList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@
<template #role="{ item }">
<template v-if="item.appRoleAssignments">{{ getRoleDisplayNameByUser(item) }}</template>
</template>
<template #status="{ item }">
<span v-if="item.login === false" class="oc-flex oc-flex-middle">
<oc-icon name="stop-circle" fill-type="line" class="oc-mr-s" /><span
v-text="$gettext('Disabled')"
/>
</span>
<span v-else class="oc-flex oc-flex-middle">
<oc-icon name="play-circle" fill-type="line" class="oc-mr-s" /><span
v-text="$gettext('Enabled')"
/>
</span>
</template>
<template #actions="{ item }">
<oc-button
v-oc-tooltip="$gettext('Details')"
Expand Down Expand Up @@ -242,6 +254,12 @@ export default defineComponent({
type: 'slot',
sortable: true
},
{
name: 'status',
title: this.$gettext('Status'),
type: 'slot',
sortable: true
},
{
name: 'actions',
title: this.$gettext('Actions'),
Expand Down
17 changes: 17 additions & 0 deletions packages/web-app-admin-settings/src/views/Users.vue
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,12 @@ export default defineComponent({
const groupFilter = groupIds?.map((id) => `memberOf/any(m:m/id eq '${id}')`).join(' and ')
const usersResponse = yield unref(graphClient).users.listUsers('displayName', groupFilter)
users.value = usersResponse.data.value || []
/**
* MOCK DATA REMOVE LATER
*/
users.value.map((u) => (u.login = false))
})
const loadResourcesTask = useTask(function* (signal, groupIds = null) {
Expand All @@ -195,6 +201,12 @@ export default defineComponent({
*/
const loadAdditionalUserDataTask = useTask(function* (signal, user) {
const { data } = yield unref(graphClient).users.getUser(user.id)
/**
* MOCK DATA REMOVE LATER
*/
data.login = false
return data
})
Expand Down Expand Up @@ -433,6 +445,11 @@ export default defineComponent({
const { data: updatedUser } = await this.graphClient.users.getUser(user.id)
/**
* MOCK DATA REMOVE LATER
*/
updatedUser.login = editUser.login
const userIndex = this.users.findIndex((user) => user.id === updatedUser.id)
this.users[userIndex] = updatedUser
Expand Down

0 comments on commit 1c0d7e0

Please sign in to comment.