From 1c506b995a2c13943f78e3c381db56d8a29b4b08 Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Tue, 14 May 2019 14:05:13 -0400
Subject: [PATCH] Use helper function to render settings page

- use front end for validation testing
- change "form" to "application_form"
---
 atst/routes/applications/settings.py          | 69 +++++++------------
 .../portfolios/applications/settings.html     |  8 +--
 2 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py
index 430095e0..b3077b77 100644
--- a/atst/routes/applications/settings.py
+++ b/atst/routes/applications/settings.py
@@ -85,23 +85,35 @@ def check_users_are_in_application(user_ids, application):
     return True
 
 
-@applications_bp.route("/applications/<application_id>/settings")
-@user_can(Permissions.VIEW_APPLICATION, message="view application edit form")
-def settings(application_id):
-    application = Applications.get(application_id)
-    form = ApplicationForm(name=application.name, description=application.description)
+def render_settings_page(application, **kwargs):
     environments_obj = get_environments_obj_for_app(application=application)
     members_form = AppEnvRolesForm(data=data_for_app_env_roles_form(application))
+    new_env_form = EditEnvironmentForm()
+
+    if "application_form" not in kwargs:
+        kwargs["application_form"] = ApplicationForm(
+            name=application.name, description=application.description
+        )
 
     return render_template(
         "portfolios/applications/settings.html",
         application=application,
-        form=form,
         environments_obj=environments_obj,
         members_form=members_form,
+        new_env_form=new_env_form,
+        **kwargs,
+    )
+
+
+@applications_bp.route("/applications/<application_id>/settings")
+@user_can(Permissions.VIEW_APPLICATION, message="view application edit form")
+def settings(application_id):
+    application = Applications.get(application_id)
+
+    return render_settings_page(
+        application=application,
         active_toggler=http_request.args.get("active_toggler"),
         active_toggler_section=http_request.args.get("active_toggler_section"),
-        new_env_form=EditEnvironmentForm(),
     )
 
 
@@ -130,17 +142,8 @@ def update_environment(environment_id):
         )
     else:
         return (
-            render_template(
-                "portfolios/applications/settings.html",
+            render_settings_page(
                 application=application,
-                form=ApplicationForm(
-                    name=application.name, description=application.description
-                ),
-                new_env_form=EditEnvironmentForm(),
-                members_form=AppEnvRolesForm(
-                    data=data_for_app_env_roles_form(application)
-                ),
-                environments_obj=get_environments_obj_for_app(application=application),
                 active_toggler=environment.id,
                 active_toggler_section="edit",
             ),
@@ -170,21 +173,7 @@ def new_environment(application_id):
             )
         )
     else:
-        return (
-            render_template(
-                "portfolios/applications/settings.html",
-                application=application,
-                form=ApplicationForm(
-                    name=application.name, description=application.description
-                ),
-                new_env_form=env_form,
-                environments_obj=get_environments_obj_for_app(application=application),
-                members_form=AppEnvRolesForm(
-                    data=data_for_app_env_roles_form(application)
-                ),
-            ),
-            400,
-        )
+        return (render_settings_page(application=application), 400)
 
 
 @applications_bp.route("/applications/<application_id>/edit", methods=["POST"])
@@ -203,13 +192,7 @@ def update(application_id):
             )
         )
     else:
-        return render_template(
-            "portfolios/applications/settings.html",
-            application=application,
-            form=form,
-            new_env_form=EditEnvironmentForm(),
-            environments_obj=get_environments_obj_for_app(application=application),
-        )
+        return render_settings_page(application=application, application_form=form)
 
 
 @applications_bp.route("/environments/<environment_id>/roles", methods=["POST"])
@@ -256,14 +239,8 @@ def update_env_roles(environment_id):
         )
     else:
         return (
-            render_template(
-                "portfolios/applications/settings.html",
+            render_settings_page(
                 application=application,
-                form=ApplicationForm(
-                    name=application.name, description=application.description
-                ),
-                new_env_form=EditEnvironmentForm(),
-                environments_obj=get_environments_obj_for_app(application=application),
                 active_toggler=environment.id,
                 active_toggler_section="edit",
             ),
diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html
index b21710ec..79062961 100644
--- a/templates/portfolios/applications/settings.html
+++ b/templates/portfolios/applications/settings.html
@@ -16,13 +16,13 @@
     <div class="panel">
       <div class="panel__content">
 
-        {{ form.csrf_token }}
+        {{ application_form.csrf_token }}
         <p>
           {{ "fragments.edit_application_form.explain" | translate }}
         </p>
         <div class="form-row">
           <div class="form-col form-col--two-thirds">
-            {{ TextInput(form.name) }}
+            {{ TextInput(application_form.name) }}
           </div>
           <div class="form-col form-col--third">
             {% if user_can(permissions.DELETE_APPLICATION) %}
@@ -45,7 +45,7 @@
         </div>
         <div class="form-row">
           <div class="form-col form-col--two-thirds">
-            {{ TextInput(form.description, paragraph=True) }}
+            {{ TextInput(application_form.description, paragraph=True) }}
           </div>
           <div class="form-col form-col--third">
             &nbsp;
@@ -96,7 +96,7 @@
           modal_id=delete_modal_environment_id,
           delete_text=('portfolios.applications.delete.button' | translate),
           delete_action= url_for('applications.delete', application_id=application.id),
-          form=form
+          form=application_form
         )
       }}
     {% endcall %}