Skip to content

UI: Allow accounts of the User type to add other accounts or users to projects through UI #9927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 5 commits into from
Nov 28, 2024
Merged

UI: Allow accounts of the User type to add other accounts or users to projects through UI #9927

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
475c83e
allow to select and enter values into the input field
bernardodemarco Nov 12, 2024
88231b3
create method for parsing listAccounts response
bernardodemarco Nov 13, 2024
d168ed2
enable users to select and enter new options to the username field
bernardodemarco Nov 13, 2024
a65b584
rename variables
bernardodemarco Nov 13, 2024
358e77c
add missing optional chaining to handle inconsistent listAccounts API…
bernardodemarco Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename variables
  • Loading branch information
@bernardodemarco
bernardodemarco committed Nov 13, 2024
commit a65b584195a56ab85f7ad447f407d680397b8c09
18 changes: 10 additions & 8 deletions ui/src/views/project/AddAccountOrUserToProject.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
<template v-if="load.accounts" #notFoundContent>
<a-spin size="small" />
</template>
<template v-if="!load.accounts" #option="item">
<span v-if="item.icon">
<resource-icon :image="item.icon.base64image" size="1x" style="margin-right: 5px"/>
<template v-if="!load.accounts" #option="account">
<span v-if="account.icon">
<resource-icon :image="account.icon.base64image" size="1x" style="margin-right: 5px"/>
</span>
<block-outlined v-else style="margin-right: 5px" />
{{ item.value }}
{{ account.name }}
</template>
</a-auto-complete>
</a-form-item>
Expand Down Expand Up @@ -126,12 +126,12 @@
<template v-if="load.users" #notFoundContent>
<a-spin size="small" />
</template>
<template v-if="!load.users" #option="item">
<span v-if="item.icon">
<resource-icon :image="item.icon.base64image" size="1x" style="margin-right: 5px"/>
<template v-if="!load.users" #option="user">
<span v-if="user.icon">
<resource-icon :image="user.icon.base64image" size="1x" style="margin-right: 5px"/>
</span>
<block-outlined v-else style="margin-right: 5px" />
{{ item.firstName + ' ' + item.lastName + " (" + item.value + ")" }}
{{ user.firstName + ' ' + user.lastName + " (" + user.username + ")" }}
</template>
</a-auto-complete>
</a-form-item>
Expand Down Expand Up @@ -273,6 +273,7 @@ export default {
return users.map(user => {
return {
value: user.username,
username: user.username,
firstName: user.firstname,
lastName: user.lastname,
icon: user.icon
Expand Down Expand Up @@ -301,6 +302,7 @@ export default {
return accounts.map(account => {
return {
value: account.name,
name: account.name,
icon: account.icon
}
})
Expand Down