Skip to content

Showing users that only Admins can add users #518

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
leandroBorgesFerreira merged 1 commit into from
Nov 7, 2025
Merged

Showing users that only Admins can add users #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
181 changes: 100 additions & 81 deletions application/features/account/src/commonMain/kotlin/io/writeopia/account/ui/SettingsDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,6 @@ private fun TeamsSection(
is ResultData.Complete -> {
val workspaces = (workspaces as ResultData.Complete<List<Workspace>>).data


LazyRow(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
items(workspaces) { workspace ->
CommonButton(text = workspace.name) {
Expand All @@ -859,86 +858,7 @@ private fun TeamsSection(
val selected = selectedWorkspaceState.collectAsState().value

if (selected != null) {
BasicText(
text = "Add users to team: ${selected.name}",
style = MaterialTheme
.typography
.titleSmall
.copy(color = MaterialTheme.colorScheme.onBackground)
)

var userEmail by remember {
mutableStateOf("")
}

Spacer(modifier = Modifier.height(6.dp))

Row(verticalAlignment = Alignment.CenterVertically) {
OutlinedTextField(
value = userEmail,
onValueChange = { userEmail = it },
shape = MaterialTheme.shapes.large,
singleLine = true,
placeholder = {
BasicText(
"User email",
style = MaterialTheme
.typography
.titleSmall
.copy(color = WriteopiaTheme.colorScheme.textLighter)
)
},
textStyle = MaterialTheme
.typography
.titleSmall
.copy(color = MaterialTheme.colorScheme.onBackground)
)

Spacer(modifier = Modifier.width(8.dp))

CommonButton(text = "Add") {
addUserToTeam(userEmail)
}
}

Spacer(modifier = Modifier.height(8.dp))

val usersResult = usersInSelectedWorkspace.collectAsState().value

if (usersResult is ResultData.Complete) {
val users = usersResult.data

Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
if (users.isNotEmpty()) {
users.forEach { userName ->
BasicText(
text = userName,
style = MaterialTheme
.typography
.bodySmall
.copy(MaterialTheme.colorScheme.onBackground)
)
}
} else {
BasicText(
text = "No users in this team",
style = MaterialTheme
.typography
.bodySmall
.copy(MaterialTheme.colorScheme.onBackground)
)
}
}
} else if (usersResult is ResultData.Error) {
BasicText(
text = "Error loading users", style = MaterialTheme
.typography
.bodySmall
.copy(MaterialTheme.colorScheme.onBackground)
)
} else {
CircularProgressIndicator()
}
AddUserToWorkspace(selected, usersInSelectedWorkspace, addUserToTeam)
}
}

Expand All @@ -962,6 +882,105 @@ private fun TeamsSection(
}
}

@Composable
private fun AddUserToWorkspace(
selected: Workspace,
usersInSelectedWorkspace: StateFlow<ResultData<List<String>>>,
addUserToTeam: (String) -> Unit
) {
if (selected.role == "ADMIN") {
BasicText(
text = "Add users to team: ${selected.name}",
style = MaterialTheme
.typography
.titleSmall
.copy(color = MaterialTheme.colorScheme.onBackground)
)

var userEmail by remember {
mutableStateOf("")
}

Spacer(modifier = Modifier.height(6.dp))

Row(verticalAlignment = Alignment.CenterVertically) {
OutlinedTextField(
value = userEmail,
onValueChange = { userEmail = it },
shape = MaterialTheme.shapes.large,
singleLine = true,
placeholder = {
BasicText(
"User email",
style = MaterialTheme
.typography
.titleSmall
.copy(color = WriteopiaTheme.colorScheme.textLighter)
)
},
textStyle = MaterialTheme
.typography
.titleSmall
.copy(color = MaterialTheme.colorScheme.onBackground)
)

Spacer(modifier = Modifier.width(8.dp))

CommonButton(text = "Add") {
addUserToTeam(userEmail)
}
}

Spacer(modifier = Modifier.height(8.dp))

val usersResult = usersInSelectedWorkspace.collectAsState().value

if (usersResult is ResultData.Complete) {
val users = usersResult.data

Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
if (users.isNotEmpty()) {
users.forEach { userName ->
BasicText(
text = userName,
style = MaterialTheme
.typography
.bodySmall
.copy(MaterialTheme.colorScheme.onBackground)
)
}
} else {
BasicText(
text = "No users in this team",
style = MaterialTheme
.typography
.bodySmall
.copy(MaterialTheme.colorScheme.onBackground)
)
}
}
} else if (usersResult is ResultData.Error) {
BasicText(
text = "Error loading users",
style = MaterialTheme
.typography
.bodySmall
.copy(MaterialTheme.colorScheme.onBackground)
)
} else {
CircularProgressIndicator()
}
} else {
BasicText(
text = "Only admins can add users",
style = MaterialTheme
.typography
.bodySmall
.copy(MaterialTheme.colorScheme.onBackground)
)
}
}

@Composable
private fun ColorThemeOptions(
selectedThemePosition: StateFlow<Int>,
Expand Down