refactor: Improve resource and service handling in controller Next me…

…thod.
Permify · Dec 26, 2024 · 6fcd260 · 6fcd260
1 parent 860b166
commit 6fcd260
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/pkg/aws/groups/controller.go b/pkg/aws/groups/controller.go
@@ -302,6 +302,15 @@ func (c *Controller) Next() tea.Model {
 				return NewServiceList(c)
 			}
 		} else {
+			// Handle case where resource is defined
+			if c.State.resource != nil {
+				return NewCreatePolicy(c)
+			}
+
+			// Handle case where service is defined
+			if c.State.service != nil {
+				return NewResourceList(c)
+			}
 			// If no policy option is selected
 			return NewPolicyOptionList(c)
 		}

diff --git a/pkg/aws/roles/controller.go b/pkg/aws/roles/controller.go
@@ -303,6 +303,15 @@ func (c *Controller) Next() tea.Model {
 				return NewServiceList(c)
 			}
 		} else {
+			// Handle case where resource is defined
+			if c.State.resource != nil {
+				return NewCreatePolicy(c)
+			}
+
+			// Handle case where service is defined
+			if c.State.service != nil {
+				return NewResourceList(c)
+			}
 			// If no policy option is selected
 			return NewPolicyOptionList(c)
 		}

diff --git a/pkg/aws/users/controller.go b/pkg/aws/users/controller.go
@@ -366,6 +366,15 @@ func (c *Controller) Next() tea.Model {
 				return NewServiceList(c)
 			}
 		} else {
+			// Handle case where resource is defined
+			if c.State.resource != nil {
+				return NewCreatePolicy(c)
+			}
+
+			// Handle case where service is defined
+			if c.State.service != nil {
+				return NewResourceList(c)
+			}
 			// If no policy option is selected
 			return NewPolicyOptionList(c)
 		}