WIP: use team form for application team page

templates/fragments/applications/add_new_application_member.html

@@ -9,23 +9,23 @@
   </div>
   <div class='form-row'>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.user_data.first_name, validation='requiredField') }}
+      {{ TextInput(new_member_form.user_data.first_name, validation='requiredField') }}
     </div>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.user_data.last_name, validation='requiredField') }}
+      {{ TextInput(new_member_form.user_data.last_name, validation='requiredField') }}
     </div>
   </div>
   <div class='form-row'>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.user_data.email, validation='email') }}
+      {{ TextInput(new_member_form.user_data.email, validation='email') }}
     </div>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.user_data.phone_number, validation='usPhone', optional=True) }}
+      {{ TextInput(new_member_form.user_data.phone_number, validation='usPhone', optional=True) }}
     </div>
   </div>
   <div class='form-row'>
     <div class='form-col form-col--half'>
-      {{ TextInput(member_form.user_data.dod_id, validation='dodId') }}
+      {{ TextInput(new_member_form.user_data.dod_id, validation='dodId') }}
     </div>
     <div class='form-col form-col--half'>
     </div>
@@ -61,7 +61,7 @@
             </span>
           </div>
         </div>
-        {% for environment_data in member_form.environment_roles %}
+        {% for environment_data in new_member_form.environment_roles %}
           <optionsinput inline-template
             v-bind:initial-value="'{{ environment_data.role.data | string }}'"
           >
@@ -86,9 +86,9 @@
         {% endfor %}
       </div>
       <h1>{{ "portfolios.applications.members.new.manage_perms" | translate({"application_name": application.name}) }}</h1>
-      {{ CheckboxInput(member_form.permission_sets.perms_team_mgmt, classes="input__inline-fields") }}
-      {% call CheckboxInput(member_form.permission_sets.perms_env_mgmt, classes="input__inline-fields") %}
-        {% set field=member_form.permission_sets.perms_del_env %}
+      {{ CheckboxInput(new_member_form.permission_sets.perms_team_mgmt, classes="input__inline-fields") }}
+      {% call CheckboxInput(new_member_form.permission_sets.perms_env_mgmt, classes="input__inline-fields") %}
+        {% set field=new_member_form.permission_sets.perms_del_env %}
         <nestedcheckboxinput
           name='{{ field.name }}'
           inline-template
@@ -128,7 +128,7 @@
 {% endset %}
 {{ MultiStepModalForm(
     'add-app-mem',
-    member_form,
+    new_member_form,
     url_for("applications.create_member", application_id=application.id),
     [step_one, step_two],
     button_text=("portfolios.admin.add_new_member" | translate),

templates/fragments/applications/read_only_team.html

@@ -0,0 +1,46 @@
+{% for member in application.members %}
+  {% set user = member.user %}
+  {% set user_info = environment_users[user.id] %}
+  {% set user_permissions = user_info["permissions"] %}
+
+    {% macro PermissionField(value) %}
+      <div class="col col--grow user-permission{% if "Edit" in value %} green{% endif %}">{{ value }}</div>
+    {% endmacro %}
+
+    <toggler inline-template>
+      <li class="accordion-table__item">
+        <div class="accordion-table__item-content row">
+          <div class="col col--grow">{{ user.full_name }}</div>
+          {{ PermissionField(user_permissions["delete_access"]) }}
+          {{ PermissionField(user_permissions["environment_management"]) }}
+          {{ PermissionField(user_permissions["team_management"]) }}
+          <div class="col col--grow icon-link icon-link--large accordion-table__item__toggler">
+            {% set open_html %}
+            {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_down') }}
+            {% endset %}
+
+            {% set close_html %}
+              {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_up') }}
+            {% endset %}
+
+            {{
+              ToggleButton(
+                open_html=open_html,
+                close_html=close_html,
+                section_name="environments"
+              )
+            }}
+          </div>
+      </div>
+      {% call ToggleSection(section_name="environments") %}
+        <ul>
+          {% for environment in user_info["environments"] %}
+            <li class="accordion-table__item__expanded">
+              {{ environment.name }}
+            </li>
+          {% endfor %}
+        </ul>
+      {% endcall %}
+    </li>
+  </toggler>
+{% endfor %}

templates/portfolios/applications/team.html

@@ -61,52 +61,12 @@
             </div>
           </div>
           <ul class="accordion-table__items">
-            {% for member in application.members %}
-              {% set user = member.user %}
-              {% set user_info = environment_users[user.id] %}
-              {% set user_permissions = user_info["permissions"] %}
-
-                {% macro PermissionField(value) %}
-                  <div class="col col--grow user-permission{% if "Edit" in value %} green{% endif %}">{{ value }}</div>
-                {% endmacro %}
-
-                <toggler inline-template>
-                  <li class="accordion-table__item">
-                    <div class="accordion-table__item-content row">
-                      <div class="col col--grow">{{ user.full_name }}</div>
-                      {{ PermissionField(user_permissions["delete_access"]) }}
-                      {{ PermissionField(user_permissions["environment_management"]) }}
-                      {{ PermissionField(user_permissions["team_management"]) }}
-                      <div class="col col--grow icon-link icon-link--large accordion-table__item__toggler">
-                        {% set open_html %}
-                        {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_down') }}
-                        {% endset %}
-
-                        {% set close_html %}
-                          {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_up') }}
-                        {% endset %}
-
-                        {{
-                          ToggleButton(
-                            open_html=open_html,
-                            close_html=close_html,
-                            section_name="environments"
-                          )
-                        }}
-                      </div>
-                  </div>
-                  {% call ToggleSection(section_name="environments") %}
-                    <ul>
-                      {% for environment in user_info["environments"] %}
-                        <li class="accordion-table__item__expanded">
-                          {{ environment.name }}
-                        </li>
-                      {% endfor %}
-                    </ul>
-                  {% endcall %}
-                </li>
-              </toggler>
-            {% endfor %}
+            {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
+              {# edit version goes here #}
+              {% include "fragments/applications/read_only_team.html" %}
+            {% elif user_can(permissions.VIEW_APPLICATION_MEMBER) %}
+              {% include "fragments/applications/read_only_team.html" %}
+            {% endif %}
           </ul>
         </div>