Merge pull request #815 from dod-ccpo/add-new-env-app-settings

Add New Environment via app settings

templates/components/delete_confirmation.html

@@ -17,7 +17,7 @@
           </button>
         </form>
         <div class="action-group">
-          <a v-on:click="deleteText = ''; $root.closeModal({{ modal_id }})" class="action-group__action icon-link icon-link--default">{{ "common.cancel" | translate }}</a>
+          <a v-on:click="deleteText = ''; $root.closeModal('{{ modal_id }}')" class="action-group__action icon-link icon-link--default">{{ "common.cancel" | translate }}</a>
         </div>
       </div>
     </div>

templates/fragments/applications/add_new_environment.html

@@ -0,0 +1,42 @@
+{% from "components/alert.html" import Alert %}
+{% from 'components/save_button.html' import SaveButton %}
+{% from "components/text_input.html" import TextInput %}
+
+<new-environment inline-template>
+  <div>
+    <div v-if="open">
+      <form method='POST' id="add-new-env" action='{{ url_for("applications.new_environment", application_id=application.id) }}' autocomplete="off" enctype="multipart/form-data">
+        {{ new_env_form.csrf_token }}
+
+        <div class="accordion-table__item-content new-env">
+          {{ Alert(
+            title=("portfolios.applications.create_new_env" | translate),
+            message=("portfolios.applications.create_new_env_info" | translate )
+          ) }}
+          <div class="h4">{{ "portfolios.applications.enter_env_name" | translate }}</div>
+            {{ TextInput(new_env_form.name, label="", validation="requiredField") }}
+        </div>
+        <div class="panel__footer">
+          <div class="action-group">
+            <div class='action-group-cancel'>
+              <a class='action-group-cancel__action icon-link icon-link--default' v-on:click="toggle">
+                {{ "common.cancel" | translate }}
+              </a>
+              {{ SaveButton(text=('common.save' | translate), element="input", form="add-new-env") }}
+            </div>
+          </div>
+        </div>
+      </form>
+    </div>
+
+    <div v-else class="panel__footer">
+      <div class="action-group">
+        <a class='icon-link' v-on:click="toggle">
+          {{ "portfolios.applications.add_environment" | translate }}
+          {{ Icon('plus') }}
+        </a>
+      </div>
+    </div>
+  </div>
+</new-environment>
+

templates/fragments/applications/edit_environments.html

@@ -115,10 +115,10 @@
 
           {{
             DeleteConfirmation(
-              modal_id=delete_modal_environment_id,
+              modal_id=delete_environment_modal_id,
               delete_text=('portfolios.applications.environments.delete.button' | translate),
               delete_action= url_for('applications.delete_environment', environment_id=env['id']),
-              form=form
+              form=edit_form
             )
           }}
         {% endcall %}
@@ -126,11 +126,3 @@
     </ul>
   </div>
 </div>
-<div class="panel__footer">
-  <div class="action-group">
-    <a class='icon-link'>
-      {{ "portfolios.applications.add_environment" | translate }}
-      {{ Icon('plus') }}
-    </a>
-  </div>
-</div>

templates/fragments/applications/edit_team.html

@@ -1,4 +1,5 @@
 {% from "components/options_input.html" import OptionsInput %}
+{% from "components/toggle_list.html" import ToggleButton, ToggleSection %}
 
 {{ team_form.csrf_token }}
 

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;
@@ -69,6 +69,10 @@
       {% if user_can(permissions.EDIT_APPLICATION) %}
         {% include "fragments/applications/edit_environments.html" %}
 
+        {% if user_can(permissions.CREATE_ENVIRONMENT) %}
+          {% include "fragments/applications/add_new_environment.html" %}
+        {% endif %}
+
       {% elif user_can(permissions.VIEW_ENVIRONMENT) %}
         {% include "fragments/applications/read_only_environments.html" %}
       {% endif %}
@@ -89,10 +93,10 @@
 
       {{
         DeleteConfirmation(
-          modal_id=delete_modal_environment_id,
+          modal_id="delete_application",
           delete_text=('portfolios.applications.delete.button' | translate),
           delete_action= url_for('applications.delete', application_id=application.id),
-          form=form
+          form=application_form
         )
       }}
     {% endcall %}

templates/portfolios/applications/team.html

@@ -1,10 +1,8 @@
 {% extends "portfolios/applications/base.html" %}
 
-{% from "components/empty_state.html" import EmptyState %}
 {% from "components/icon.html" import Icon %}
-{% from 'components/save_button.html' import SaveButton %}
-{% from "components/toggle_list.html" import ToggleButton, ToggleSection %}
 {% from "components/multi_step_modal_form.html" import MultiStepModalForm %}
+{% from 'components/save_button.html' import SaveButton %}
 {% import "fragments/applications/new_member_modal_content.html" as member_steps %}
 {% from "components/alert.html" import Alert %}
 {% from "components/delete_confirmation.html" import DeleteConfirmation %}