-
Notifications
You must be signed in to change notification settings - Fork 159
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement user group assignments
- Loading branch information
Jan
committed
Jun 24, 2022
1 parent
b9811c4
commit ff48a00
Showing
17 changed files
with
576 additions
and
413 deletions.
There are no files selected for viewing
6 changes: 6 additions & 0 deletions
6
changelog/unreleased/enhancement-user-management-group-assignments
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| Enhancement: Introduce group assignments | ||
|
|
||
| We have added a new quick action in the user management where the user can be assigned to groups. | ||
|
|
||
| https://github.com/owncloud/web/pull/7176 | ||
| https://github.com/owncloud/web/issues/6678 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
packages/web-app-user-management/src/components/Users/SideBar/GroupAssignmentsPanel.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| <template> | ||
| <div v-if="user" class="oc-mt-xl"> | ||
| <UserInfoBox :user="user" /> | ||
| <div v-if="editUser" class="oc-background-highlight oc-p-m"> | ||
| <oc-select | ||
| v-model="editUser.memberOf" | ||
| multiple | ||
| :options="groups" | ||
| option-label="displayName" | ||
| :label="$gettext('Add or remove groups')" | ||
| :fix-message-line="true" | ||
| > | ||
| <template #selected-option="{ displayName, id }"> | ||
| <span class="oc-flex oc-flex-center"> | ||
| <avatar-image | ||
| class="oc-flex oc-align-self-center oc-mr-s" | ||
| :width="16.8" | ||
| :userid="id" | ||
| :user-name="displayName" | ||
| /> | ||
| <span>{{ displayName }}</span> | ||
| </span> | ||
| </template> | ||
| <template #option="{ displayName, id }"> | ||
| <div class="oc-flex"> | ||
| <span class="oc-flex oc-flex-center"> | ||
| <avatar-image | ||
| class="oc-flex oc-align-self-center oc-mr-s" | ||
| :width="16.8" | ||
| :userid="id" | ||
| :user-name="displayName" | ||
| /> | ||
| <span>{{ displayName }}</span> | ||
| </span> | ||
| </div> | ||
| </template> | ||
| </oc-select> | ||
| </div> | ||
| <compare-save-dialog | ||
| class="edit-compare-save-dialog" | ||
| :original-object="originalObjectUser" | ||
| :compare-object="compareObjectUser" | ||
| @revert="revertChanges" | ||
| @confirm="$emit('confirm', editUser)" | ||
| ></compare-save-dialog> | ||
| </div> | ||
| </template> | ||
| <script> | ||
| import UserInfoBox from './UserInfoBox.vue' | ||
| import CompareSaveDialog from '../../CompareSaveDialog.vue' | ||
| export default { | ||
| name: 'GroupAssignmentsPanel', | ||
| components: { | ||
| UserInfoBox, | ||
| CompareSaveDialog | ||
| }, | ||
| props: { | ||
| users: { | ||
| type: Array, | ||
| required: true | ||
| }, | ||
| groups: { | ||
| type: Array, | ||
| required: true | ||
| } | ||
| }, | ||
| data() { | ||
| return { | ||
| editUser: {} | ||
| } | ||
| }, | ||
| computed: { | ||
| user() { | ||
| return this.users.length === 1 ? this.users[0] : null | ||
| }, | ||
| originalObjectUser() { | ||
| return { user: { ...this.user } } | ||
| }, | ||
| compareObjectUser() { | ||
| return { user: { ...this.editUser } } | ||
| } | ||
| }, | ||
| watch: { | ||
| user: { | ||
| handler: function () { | ||
| this.editUser = { ...this.user } | ||
| }, | ||
| deep: true, | ||
| immediate: true | ||
| } | ||
| }, | ||
| methods: { | ||
| revertChanges() { | ||
| this.editUser = { ...this.user } | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
| <style lang="scss"> | ||
| .edit-compare-save-dialog { | ||
| position: absolute; | ||
| bottom: 0; | ||
| left: 0; | ||
| } | ||
| </style> |
27 changes: 27 additions & 0 deletions
27
packages/web-app-user-management/src/components/Users/SideBar/UserInfoBox.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <template> | ||
| <div class="oc-flex user-info oc-mb-l"> | ||
| <avatar-image class="oc-mb-m" :width="80" :userid="user.id" :user-name="user.displayName" /> | ||
| <span v-text="user.onPremisesSamAccountName"></span> | ||
| <span class="oc-text-muted user-info-display-name" v-text="user.displayName"></span> | ||
| </div> | ||
| </template> | ||
| <script> | ||
| export default { | ||
| name: 'UserInfoBox', | ||
| props: { | ||
| user: { | ||
| type: Object, | ||
| required: true | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
| <style lang="scss"> | ||
| .user-info { | ||
| align-items: center; | ||
| flex-direction: column; | ||
| } | ||
| .user-info-display-name { | ||
| font-size: 1.5rem; | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.