Skip to content
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.

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

chore: Implement user deletion #952

Merged
merged 2 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 3 additions & 3 deletions openstack_tui/.config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ mode_keybindings:
"y":
action: DescribeApiResponse
description: YAML
"ctrl-d":
action: IdentityUserDelete
description: Delete
"e":
action: IdentityUserFlipEnable
description: Enable/Disable user
"r":
action: IdentityUserDelete
description: Delete user (todo!)
"a":
action: IdentityUserCreate
description: Create new user (todo!)
Expand Down
31 changes: 30 additions & 1 deletion openstack_tui/src/components/identity/users.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
action::Action,
cloud_worker::identity::v3::{
IdentityApiRequest, IdentityUserApiRequest, IdentityUserApplicationCredentialListBuilder,
IdentityUserList, IdentityUserSetBuilder,
IdentityUserDelete, IdentityUserDeleteBuilder, IdentityUserList, IdentityUserSetBuilder,
},
cloud_worker::types::ApiRequest,
components::{table_view::TableViewComponentBase, Component},
Expand Down Expand Up @@ -118,6 +118,27 @@
}
}
}
Action::IdentityUserDelete => {
// only if we are currently in the proper mode
if current_mode == Mode::IdentityUsers {
// and have command_tx
if let Some(command_tx) = self.get_command_tx() {
// and have a selected entry
if let Some(row) = self.get_selected() {
// send action to set Delete User
command_tx.send(Action::Confirm(ApiRequest::from(
IdentityUserApiRequest::Delete(Box::new(
IdentityUserDeleteBuilder::default()
.id(row.id.clone())
.name(row.name.clone())
.build()
.wrap_err("cannot prepare user delete request")?,
)),
)))?;
}
}
}
}
Action::ShowIdentityUserApplicationCredentials => {
// only if we are currently in the proper mode
if current_mode == Mode::IdentityUsers {
Expand Down Expand Up @@ -170,6 +191,14 @@
self.sync_table_data()?;
}
self.set_loading(false);
} else if let IdentityUserApiRequest::Delete(del) = *req {
if let IdentityUserDelete { id, .. } = *del {

Check warning

Code scanning / clippy

irrefutable if let pattern Warning

irrefutable if let pattern

Check warning

Code scanning / clippy

irrefutable if let pattern Warning

irrefutable if let pattern
if self.delete_item_row_by_res_id_mut(&id)?.is_none() {
return Ok(Some(Action::Refresh));
}
self.sync_table_data()?;
self.set_loading(false);
}
}
}
_ => {}
Expand Down
19 changes: 19 additions & 0 deletions openstack_tui/src/components/table_view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,25 @@ where
None
}

/// delete the row with the typed data matching resource id
#[instrument(level = "debug", skip(self))]
pub fn delete_item_row_by_res_id_mut(&mut self, search_id: &String) -> Result<Option<usize>> {
let mut item_idx: Option<usize> = None;
for (idx, raw_item) in self.raw_items.iter_mut().enumerate() {
if let Some(row_item_id) = raw_item.get("id").or(raw_item.get("uuid")) {
if row_item_id == search_id {
item_idx = Some(idx);
break;
}
}
}
if let Some(idx) = item_idx {
self.raw_items.remove(idx);
self.items.remove(idx);
}
Ok(item_idx)
}

pub fn get_selected_raw(&self) -> Option<&Value> {
self.state.selected().map(|x| &self.raw_items[x])
}
Expand Down