remove frontend role selection for edit member

atst/forms/edit_member.py

@@ -1,18 +0,0 @@
-from wtforms.validators import Required
-
-from .forms import BaseForm
-from atst.forms.fields import SelectField
-from atst.utils.localization import translate
-
-from .data import PORTFOLIO_ROLES
-
-
-class EditMemberForm(BaseForm):
-    # This form also accepts a field for each environment in each application
-    #  that the user is a member of
-
-    portfolio_role = SelectField(
-        translate("forms.edit_member.portfolio_role_label"),
-        choices=PORTFOLIO_ROLES,
-        validators=[Required()],
-    )

atst/forms/new_member.py

@@ -1,63 +0,0 @@
-from wtforms.fields import StringField
-from wtforms.fields.html5 import EmailField
-from wtforms.validators import Required, Email, Length
-
-from .forms import BaseForm
-from atst.forms.validators import IsNumber
-from atst.forms.fields import SelectField
-from atst.utils.localization import translate
-
-
-class NewMemberForm(BaseForm):
-
-    first_name = StringField(
-        label=translate("forms.new_member.first_name_label"), validators=[Required()]
-    )
-    last_name = StringField(
-        label=translate("forms.new_member.last_name_label"), validators=[Required()]
-    )
-    email = EmailField(
-        translate("forms.new_member.email_label"), validators=[Required(), Email()]
-    )
-    dod_id = StringField(
-        translate("forms.new_member.dod_id_label"),
-        validators=[Required(), Length(min=10), IsNumber()],
-    )
-    perms_app_mgmt = SelectField(
-        None,
-        choices=[
-            ("view_portfolio_application_management", "View Only"),
-            ("edit_portfolio_application_management", "Edit Access"),
-        ],
-    )
-    perms_funding = SelectField(
-        None,
-        choices=[
-            ("view_portfolio_funding", "View Only"),
-            ("edit_portfolio_funding", "Edit Access"),
-        ],
-    )
-    perms_reporting = SelectField(
-        None,
-        choices=[
-            ("view_portfolio_reports", "View Only"),
-            ("edit_portfolio_reports", "Edit Access"),
-        ],
-    )
-    perms_portfolio_mgmt = SelectField(
-        None,
-        choices=[
-            ("view_portfolio_admin", "View Only"),
-            ("edit_portfolio_admin", "Edit Access"),
-        ],
-    )
-
-    @property
-    def data(self):
-        _data = super().data
-        _data["permission_sets"] = []
-        for field in _data:
-            if "perms" in field:
-                _data["permission_sets"].append(_data[field])
-
-        return _data

atst/forms/portfolio_member.py

@@ -0,0 +1,71 @@
+from wtforms.fields import StringField
+from wtforms.fields.html5 import EmailField
+from wtforms.validators import Required, Email, Length
+
+from .forms import BaseForm
+from atst.forms.validators import IsNumber
+from atst.forms.fields import SelectField
+from atst.utils.localization import translate
+
+
+class PermissionsForm(BaseForm):
+    perms_app_mgmt = SelectField(
+        None,
+        choices=[
+            ("view_portfolio_application_management", "View Only"),
+            ("edit_portfolio_application_management", "Edit Access"),
+        ],
+    )
+    perms_funding = SelectField(
+        None,
+        choices=[
+            ("view_portfolio_funding", "View Only"),
+            ("edit_portfolio_funding", "Edit Access"),
+        ],
+    )
+    perms_reporting = SelectField(
+        None,
+        choices=[
+            ("view_portfolio_reports", "View Only"),
+            ("edit_portfolio_reports", "Edit Access"),
+        ],
+    )
+    perms_portfolio_mgmt = SelectField(
+        None,
+        choices=[
+            ("view_portfolio_admin", "View Only"),
+            ("edit_portfolio_admin", "Edit Access"),
+        ],
+    )
+
+    @property
+    def data(self):
+        _data = super().data
+        _data["permission_sets"] = []
+        for field in _data:
+            if "perms" in field:
+                _data["permission_sets"].append(_data[field])
+
+        return _data
+
+
+class EditForm(PermissionsForm):
+    # This form also accepts a field for each environment in each application
+    #  that the user is a member of
+    pass
+
+
+class NewForm(PermissionsForm):
+    first_name = StringField(
+        label=translate("forms.new_member.first_name_label"), validators=[Required()]
+    )
+    last_name = StringField(
+        label=translate("forms.new_member.last_name_label"), validators=[Required()]
+    )
+    email = EmailField(
+        translate("forms.new_member.email_label"), validators=[Required(), Email()]
+    )
+    dod_id = StringField(
+        translate("forms.new_member.dod_id_label"),
+        validators=[Required(), Length(min=10), IsNumber()],
+    )