Move perms so they are at the top level of the form so that the data is properly populated

Add form fields for all environments in update member form

tests/forms/test_application_member.py

@@ -39,12 +39,9 @@ def test_environment_form_invalid():
 
 def test_update_member_form():
     form_data = {
-        "member_role_id": 123,
-        "permission_sets": {
-            "perms_team_mgmt": True,
-            "perms_env_mgmt": False,
-            "perms_del_env": False,
-        },
+        "perms_team_mgmt": True,
+        "perms_env_mgmt": False,
+        "perms_del_env": False,
         "environment_roles": {
             "environment_id": 123,
             "environment_name": "testing",
@@ -53,3 +50,6 @@ def test_update_member_form():
     }
     form = UpdateMemberForm(data=form_data)
     assert form.validate()
+    assert form.perms_team_mgmt.data
+    assert not form.perms_env_mgmt.data
+    assert not form.perms_del_env.data

tests/routes/applications/test_settings.py

@@ -488,9 +488,9 @@ def test_update_member(client, user_session):
             "environment_roles-2-environment_id": env_2.id,
             "environment_roles-2-role": CSPRole.NETWORK_ADMIN.value,
             "environment_roles-2-environment_name": env_2.name,
-            "permission_sets-perms_env_mgmt": True,
-            "permission_sets-perms_team_mgmt": True,
-            "permission_sets-perms_del_env": True,
+            "perms_env_mgmt": True,
+            "perms_team_mgmt": True,
+            "perms_del_env": True,
         },
     )