Template fixes

js/components/forms/requests_list.js

@@ -1,4 +1,3 @@
-import Modal from '../../mixins/modal'
 import LocalDatetime from '../../components/local_datetime'
 import { formatDollars } from '../../lib/dollars'
 import { parse } from 'date-fns'
@@ -7,11 +6,8 @@ import { compose, partial, indexBy, prop, sortBy, reverse, pipe } from 'ramda'
 export default {
     name: 'requests-list',
 
-    mixins: [Modal],
-
     components: {
-      Modal,
-      LocalDatetime
+      LocalDatetime,
     },
 
     props: {
@@ -88,9 +84,6 @@ export default {
       }
     },
 
-    mounted: function () {
-    },
-
     computed: {
       filteredRequests: function () {
         return pipe(

templates/requests/index.html

@@ -6,8 +6,6 @@
 {% from "components/icon.html" import Icon %}
 
 {% block content %}
-  <requests-list inline-template v-bind:requests='{{ requests | tojson }}' v-bind:is-extended='{{ extended_view | tojson }}' v-bind:statuses='{{ possible_statuses | tojson }}'>
-    <div>
 
   {% call Modal(name='pendingFinancialVerification', dismissable=True) %}
     <h1>Request submitted!</h1>
@@ -39,6 +37,9 @@
     </div>
   {% endcall %}
 
+  <requests-list inline-template v-bind:requests='{{ requests | tojson }}' v-bind:is-extended='{{ extended_view | tojson }}' v-bind:statuses='{{ possible_statuses | tojson }}'>
+    <div>
+
 {% if num_action_required %}
   {% set title -%}
     Action required on {{ num_action_required }} requests.
@@ -82,7 +83,7 @@
         <div class='usa-input search-input'>
           <label for='requests-search'>Search requests by name</label>
           <input v-model='searchValue' type='search' id='requests-search' name='requests-search' placeholder="Search by name"/>
-          <button type="submit">
+          <button>
             <span class="hide">Search</span>
           </button>
         </div>
@@ -104,7 +105,7 @@
           <tr>
             <th @click.prevent="updateSortValue(column.attr)" v-for="column in getColumns()"scope="col">
               !{ column.displayName }
-              <span v-if="column.attr === sort.columnName && sort.isAscending" class="icon icon--caret_up" aria-idden="true">
+              <span v-if="column.attr === sort.columnName && sort.isAscending">
                 {{ Icon("caret_down") }}
               </span>
               <span v-else-if="column.attr === sort.columnName && !sort.isAscending">