Skip to content

Commit

Permalink
fix: #2218 Additional cleanup from removing useNewTable feature flag (#…
Browse files Browse the repository at this point in the history
…2324)

* fix: #2218 remove last use of the useNewTable feature flag

* fix: remove GrantsTableNext.vue
  • Loading branch information
adele-usdr authored Dec 12, 2023
1 parent ec2f641 commit 7d4d4ee
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 447 deletions.
15 changes: 9 additions & 6 deletions packages/client/src/components/GrantsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="ml-3">
<SavedSearchPanel :isDisabled="loading" />
</div>
<div class="ml-2">
<div class="ml-1">
<SearchPanel :isDisabled="loading" ref="searchPanel" :search-id="Number(editingSearchId)" @filters-applied="paginateGrants" />
</div>
</b-row>
Expand All @@ -13,15 +13,16 @@
<SearchFilter :isDisabled="loading" :filterKeys="searchFilters" @filter-removed="clearSearch" />
</b-col>
<b-col align-self="end" v-if="!showSearchControls">
<h4 class="mb-0">{{ searchTitle }}</h4>
<h2 class="mb-0">{{ searchTitle }}</h2>
</b-col>
<b-col align-self="end">
<p class="mb-0 text-right text-nowrap"><a href="#" @click="exportCSV" :disabled="loading" variant="outline-primary border-0">Export CSV</a></p>
<b-col class="d-flex justify-content-end">
<b-button @click="exportCSV" :disabled="loading" variant="outline-primary" size="sm">
<b-icon icon="download" class="mr-2" aria-hidden="true" />Export to CSV</b-button>
</b-col>
</b-row>
<b-row align-v="center">
<b-col cols="12">
<b-table id="grants-table" sticky-header="70vh" hover :items="formattedGrants"
<b-table id="grants-table" hover responsive stacked="sm" :items="formattedGrants"
:fields="fields.filter(field => !field.hideGrantItem)" selectable striped :sort-by.sync="orderBy"
:sort-desc.sync="orderDesc" :no-local-sorting="true" :bordered="true" select-mode="single" :busy="loading"
@row-selected="onRowSelected" show-empty emptyText="No matches found">
Expand Down Expand Up @@ -75,6 +76,7 @@

<script>
import { mapActions, mapGetters } from 'vuex';
import { newTerminologyEnabled } from '@/helpers/featureFlags';
import { titleize } from '../helpers/form-helpers';
import GrantDetails from './Modals/GrantDetails.vue';
import SearchPanel from './Modals/SearchPanel.vue';
Expand Down Expand Up @@ -113,6 +115,7 @@ export default {
},
{
key: 'interested_agencies',
label: `Interested ${newTerminologyEnabled() ? 'Teams' : 'Agencies'}`,
},
{
// opportunity_status
Expand Down Expand Up @@ -300,7 +303,7 @@ export default {
}
},
notifyError() {
this.$bvToast.toast('We encountered an error while retriving grants data. For the most accurate results please refresh the page and try again.', {
this.$bvToast.toast('We encountered an error while retrieving grants data. For the most accurate results please refresh the page and try again.', {
title: 'Something went wrong',
variant: 'danger',
solid: true,
Expand Down
Loading

0 comments on commit 7d4d4ee

Please sign in to comment.