refactor(tui): Forward identity to gen ResourceBehaviour (#1976)

PR #1975 added the generated mechanical tier for the identity resources.
Thin the hand-written `ResourceBehaviour` impls to one-line forwarders
onto `super::generated::<r>::Generated::<method>`, keeping only custom
logic:

- `users.rs`: `action_to_request` enable/disable toggle,
  `confirm_request` delete prompt, `filter_carry_action` drilldown into
  application credentials, `handle_mutation_response`, and the two
  `TryFrom<&serde_json::Value>` builders.
- `projects.rs`: `filter_carry_action` translating `SwitchToProject`
  into a `CloudChangeScope`.
- `groups.rs`: `confirm_request` delete prompt, `filter_carry_action`
  drilldown into group users, and its two `TryFrom` builders.

`group_users.rs` and `application_credentials.rs` are nested resources
the generator does not emit and are left untouched. Test title
expectations move to the generator's prefix-stripped form ("Users",
"Projects", "Groups").

Assisted-By: Claude Sonnet 5 <noreply@anthropic.com>

Signed-off-by: Artem Goncharov <artem.goncharov@gmail.com>

Author: gtema

openstack_tui/src/components/identity/groups.rs

@@ -13,21 +13,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::action::Action;
-use crate::cloud_worker::identity::v3::{
-    IdentityApiRequest, IdentityGroupApiRequest, IdentityGroupDelete, IdentityGroupDeleteBuilder,
-    IdentityGroupList, IdentityGroupUserList, IdentityGroupUserListBuilder,
-};
-use crate::cloud_worker::types::ApiRequest;
+use crate::cloud_worker::types::{self as cloud_types, ApiRequest};
 use crate::components::generic_resource_view::GenericResourceView;
-use crate::components::resource_behaviour::ResourceBehaviour;
+use crate::components::resource_behaviour::{GeneratedResourceBehaviour, ResourceBehaviour};
 use crate::mode::Mode;
 
-const VIEW_CONFIG_KEY: &str = "identity.group";
-
-impl TryFrom<&serde_json::Value> for IdentityGroupUserList {
+impl TryFrom<&serde_json::Value> for cloud_types::IdentityGroupUserList {
     type Error = crate::cloud_worker::identity::v3::IdentityGroupUserListBuilderError;
     fn try_from(value: &serde_json::Value) -> Result<Self, Self::Error> {
-        let mut builder = IdentityGroupUserListBuilder::default();
+        let mut builder =
+            crate::cloud_worker::identity::v3::IdentityGroupUserListBuilder::default();
         if let Some(val) = crate::components::view_render::get_str(value, "/id") {
             builder.group_id(val.to_string());
         }
@@ -38,10 +33,10 @@ impl TryFrom<&serde_json::Value> for IdentityGroupUserList {
     }
 }
 
-impl TryFrom<&serde_json::Value> for IdentityGroupDelete {
+impl TryFrom<&serde_json::Value> for cloud_types::IdentityGroupDelete {
     type Error = crate::cloud_worker::identity::v3::IdentityGroupDeleteBuilderError;
     fn try_from(value: &serde_json::Value) -> Result<Self, Self::Error> {
-        let mut builder = IdentityGroupDeleteBuilder::default();
+        let mut builder = crate::cloud_worker::identity::v3::IdentityGroupDeleteBuilder::default();
         if let Some(val) = crate::components::view_render::get_str(value, "/id") {
             builder.id(val.to_string());
         }
@@ -55,26 +50,22 @@ impl TryFrom<&serde_json::Value> for IdentityGroupDelete {
 pub struct IdentityGroupsBehaviour;
 
 impl ResourceBehaviour for IdentityGroupsBehaviour {
-    type Filter = IdentityGroupList;
+    type Filter = cloud_types::IdentityGroupList;
 
     fn view_key() -> &'static str {
-        VIEW_CONFIG_KEY
+        super::generated::group::Generated::view_key()
     }
     fn title() -> &'static str {
-        "Identity Groups"
+        super::generated::group::Generated::title()
     }
     fn mode() -> Mode {
-        Mode::Resource(Self::view_key())
+        super::generated::group::Generated::mode()
     }
     fn request_from_filter(filter: &Self::Filter) -> ApiRequest {
-        ApiRequest::from(IdentityGroupApiRequest::List(Box::new(filter.clone())))
+        super::generated::group::Generated::request_from_filter(filter)
     }
     fn matches_request(request: &ApiRequest) -> bool {
-        matches!(
-            request,
-            ApiRequest::Identity(IdentityApiRequest::Group(boxreq))
-            if matches!(**boxreq, IdentityGroupApiRequest::List(_))
-        )
+        super::generated::group::Generated::matches_request(request)
     }
     fn confirm_request(
         action: &Action,
@@ -86,10 +77,10 @@ impl ResourceBehaviour for IdentityGroupsBehaviour {
         } = action
             && *key == Self::view_key()
         {
-            let del = IdentityGroupDelete::try_from(selected?).ok()?;
-            Some(ApiRequest::from(IdentityGroupApiRequest::Delete(Box::new(
-                del,
-            ))))
+            let del = cloud_types::IdentityGroupDelete::try_from(selected?).ok()?;
+            Some(ApiRequest::from(
+                cloud_types::IdentityGroupApiRequest::Delete(Box::new(del)),
+            ))
         } else {
             None
         }
@@ -102,7 +93,7 @@ impl ResourceBehaviour for IdentityGroupsBehaviour {
         if let Action::ShowResource(key) = action
             && *key == crate::mode::IDENTITY_GROUP_USER
             && let Some(sel) = selected
-            && let Ok(list) = IdentityGroupUserList::try_from(sel)
+            && let Ok(list) = cloud_types::IdentityGroupUserList::try_from(sel)
         {
             return vec![
                 Action::Mode {
@@ -135,7 +126,7 @@ mod tests {
     #[test]
     fn view_key_and_title() {
         assert_eq!(IdentityGroupsBehaviour::view_key(), "identity.group");
-        assert_eq!(IdentityGroupsBehaviour::title(), "Identity Groups");
+        assert_eq!(IdentityGroupsBehaviour::title(), "Groups");
         assert_eq!(
             IdentityGroupsBehaviour::mode(),
             Mode::Resource(crate::mode::IDENTITY_GROUP)
@@ -144,29 +135,29 @@ mod tests {
 
     #[test]
     fn request_from_filter_creates_list_request() {
-        let filter = IdentityGroupList::default();
+        let filter = cloud_types::IdentityGroupList::default();
         let request = IdentityGroupsBehaviour::request_from_filter(&filter);
         assert!(matches!(
             request,
-            ApiRequest::Identity(IdentityApiRequest::Group(boxreq))
-            if matches!(*boxreq, IdentityGroupApiRequest::List(_))
+            ApiRequest::Identity(cloud_types::IdentityApiRequest::Group(boxreq))
+            if matches!(*boxreq, cloud_types::IdentityGroupApiRequest::List(_))
         ));
     }
 
     #[test]
     fn matches_request_returns_true_for_list() {
-        let filter = IdentityGroupList::default();
+        let filter = cloud_types::IdentityGroupList::default();
         let request = IdentityGroupsBehaviour::request_from_filter(&filter);
         assert!(IdentityGroupsBehaviour::matches_request(&request));
     }
 
     #[test]
     fn matches_request_returns_false_for_unrelated() {
-        let del = IdentityGroupDeleteBuilder::default()
+        let del = crate::cloud_worker::identity::v3::IdentityGroupDeleteBuilder::default()
             .id("test".into())
             .build()
             .unwrap();
-        let req = ApiRequest::from(IdentityGroupApiRequest::Delete(Box::new(del)));
+        let req = ApiRequest::from(cloud_types::IdentityGroupApiRequest::Delete(Box::new(del)));
         assert!(!IdentityGroupsBehaviour::matches_request(&req));
     }
 
@@ -184,8 +175,8 @@ mod tests {
         let request = result.unwrap();
         assert!(matches!(
             request,
-            ApiRequest::Identity(IdentityApiRequest::Group(boxreq))
-            if matches!(*boxreq, IdentityGroupApiRequest::Delete(_))
+            ApiRequest::Identity(cloud_types::IdentityApiRequest::Group(boxreq))
+            if matches!(*boxreq, cloud_types::IdentityGroupApiRequest::Delete(_))
         ));
     }
 
@@ -227,7 +218,7 @@ mod tests {
         let actions = IdentityGroupsBehaviour::filter_carry_action(
             &Action::ShowResource(crate::mode::IDENTITY_GROUP_USER),
             Some(&group),
-            &IdentityGroupList::default(),
+            &cloud_types::IdentityGroupList::default(),
         );
         assert_eq!(actions.len(), 2);
         assert!(matches!(
@@ -248,7 +239,7 @@ mod tests {
         let actions = IdentityGroupsBehaviour::filter_carry_action(
             &Action::ShowResource(crate::mode::IDENTITY_GROUP_USER),
             None,
-            &IdentityGroupList::default(),
+            &cloud_types::IdentityGroupList::default(),
         );
         assert!(actions.is_empty());
     }
@@ -259,7 +250,7 @@ mod tests {
         let actions = IdentityGroupsBehaviour::filter_carry_action(
             &Action::ShowResource(crate::mode::IDENTITY_GROUP),
             Some(&group),
-            &IdentityGroupList::default(),
+            &cloud_types::IdentityGroupList::default(),
         );
         assert!(actions.is_empty());
     }
@@ -270,7 +261,7 @@ mod tests {
         let actions = IdentityGroupsBehaviour::filter_carry_action(
             &Action::Tick,
             Some(&group),
-            &IdentityGroupList::default(),
+            &cloud_types::IdentityGroupList::default(),
         );
         assert!(actions.is_empty());
     }

openstack_tui/src/components/identity/projects.rs

@@ -13,39 +13,30 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::action::Action;
-use crate::cloud_worker::identity::v3::{
-    IdentityApiRequest, IdentityProjectApiRequest, IdentityProjectList,
-};
-use crate::cloud_worker::types::ApiRequest;
+use crate::cloud_worker::types::{self as cloud_types, ApiRequest};
 use crate::components::generic_resource_view::GenericResourceView;
-use crate::components::resource_behaviour::ResourceBehaviour;
+use crate::components::resource_behaviour::{GeneratedResourceBehaviour, ResourceBehaviour};
 use crate::mode::Mode;
 
-const VIEW_CONFIG_KEY: &str = "identity.project";
-
 pub struct IdentityProjectsBehaviour;
 
 impl ResourceBehaviour for IdentityProjectsBehaviour {
-    type Filter = IdentityProjectList;
+    type Filter = cloud_types::IdentityProjectList;
 
     fn view_key() -> &'static str {
-        VIEW_CONFIG_KEY
+        super::generated::project::Generated::view_key()
     }
     fn title() -> &'static str {
-        "Identity Projects"
+        super::generated::project::Generated::title()
     }
     fn mode() -> Mode {
-        Mode::Resource(Self::view_key())
+        super::generated::project::Generated::mode()
     }
     fn request_from_filter(filter: &Self::Filter) -> ApiRequest {
-        ApiRequest::from(IdentityProjectApiRequest::List(Box::new(filter.clone())))
+        super::generated::project::Generated::request_from_filter(filter)
     }
     fn matches_request(request: &ApiRequest) -> bool {
-        matches!(
-            request,
-            ApiRequest::Identity(IdentityApiRequest::Project(boxreq))
-            if matches!(**boxreq, IdentityProjectApiRequest::List(_))
-        )
+        super::generated::project::Generated::matches_request(request)
     }
     fn filter_carry_action(
         action: &Action,
@@ -92,7 +83,7 @@ mod tests {
     #[test]
     fn view_key_and_title() {
         assert_eq!(IdentityProjectsBehaviour::view_key(), "identity.project");
-        assert_eq!(IdentityProjectsBehaviour::title(), "Identity Projects");
+        assert_eq!(IdentityProjectsBehaviour::title(), "Projects");
         assert_eq!(
             IdentityProjectsBehaviour::mode(),
             Mode::Resource(crate::mode::IDENTITY_PROJECT)
@@ -101,18 +92,18 @@ mod tests {
 
     #[test]
     fn request_from_filter_creates_list_request() {
-        let filter = IdentityProjectList::default();
+        let filter = cloud_types::IdentityProjectList::default();
         let request = IdentityProjectsBehaviour::request_from_filter(&filter);
         assert!(matches!(
             request,
-            ApiRequest::Identity(IdentityApiRequest::Project(boxreq))
-            if matches!(*boxreq, IdentityProjectApiRequest::List(_))
+            ApiRequest::Identity(cloud_types::IdentityApiRequest::Project(boxreq))
+            if matches!(*boxreq, cloud_types::IdentityProjectApiRequest::List(_))
         ));
     }
 
     #[test]
     fn matches_request_returns_true_for_list() {
-        let filter = IdentityProjectList::default();
+        let filter = cloud_types::IdentityProjectList::default();
         let request = IdentityProjectsBehaviour::request_from_filter(&filter);
         assert!(IdentityProjectsBehaviour::matches_request(&request));
     }
@@ -123,7 +114,9 @@ mod tests {
             .id("test".into())
             .build()
             .unwrap();
-        let req = ApiRequest::from(IdentityProjectApiRequest::Delete(Box::new(del)));
+        let req = ApiRequest::from(cloud_types::IdentityProjectApiRequest::Delete(Box::new(
+            del,
+        )));
         assert!(!IdentityProjectsBehaviour::matches_request(&req));
     }
 
@@ -133,7 +126,7 @@ mod tests {
         let actions = IdentityProjectsBehaviour::filter_carry_action(
             &Action::SwitchToProject,
             Some(&project),
-            &IdentityProjectList::default(),
+            &cloud_types::IdentityProjectList::default(),
         );
         assert_eq!(actions.len(), 1);
         assert!(matches!(actions[0], Action::CloudChangeScope(_)));
@@ -144,7 +137,7 @@ mod tests {
         let actions = IdentityProjectsBehaviour::filter_carry_action(
             &Action::SwitchToProject,
             None,
-            &IdentityProjectList::default(),
+            &cloud_types::IdentityProjectList::default(),
         );
         assert!(actions.is_empty());
     }
@@ -155,7 +148,7 @@ mod tests {
         let actions = IdentityProjectsBehaviour::filter_carry_action(
             &Action::Tick,
             Some(&project),
-            &IdentityProjectList::default(),
+            &cloud_types::IdentityProjectList::default(),
         );
         assert!(actions.is_empty());
     }