From a0eb750541a8781503bf8cc063e7f8da2b8fd723 Mon Sep 17 00:00:00 2001 From: Jorge Date: Thu, 22 Apr 2021 18:18:11 +0200 Subject: [PATCH 1/2] change permalink route | clear search --- .../gobierto_visualizations/webapp/components/SearchFilter.vue | 2 +- .../webapp/containers/contracts/AssigneesShow.vue | 3 +-- .../webapp/containers/contracts/ContractsIndex.vue | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/javascript/gobierto_visualizations/webapp/components/SearchFilter.vue b/app/javascript/gobierto_visualizations/webapp/components/SearchFilter.vue index 662e4159fa..672e084dac 100644 --- a/app/javascript/gobierto_visualizations/webapp/components/SearchFilter.vue +++ b/app/javascript/gobierto_visualizations/webapp/components/SearchFilter.vue @@ -61,7 +61,7 @@ export default { }, handlerClearSearch() { this.search = '' - EventBus.$emit('filtered-items', this.search) + EventBus.$emit('filtered-items', this.data) EventBus.$emit('filtered-items-grouped', this.data) } } diff --git a/app/javascript/gobierto_visualizations/webapp/containers/contracts/AssigneesShow.vue b/app/javascript/gobierto_visualizations/webapp/containers/contracts/AssigneesShow.vue index bc90a31ada..4f68d50dfe 100644 --- a/app/javascript/gobierto_visualizations/webapp/containers/contracts/AssigneesShow.vue +++ b/app/javascript/gobierto_visualizations/webapp/containers/contracts/AssigneesShow.vue @@ -65,8 +65,7 @@ export default { this.items = contracts this.columns = assigneesShowColumns; - - this.tableItems = this.items.map(d => ({ ...d, href: `${location.origin}${location.pathname}/${d.id}` } )) + this.tableItems = this.items.map(d => ({ ...d, href: `${location.origin}/visualizaciones/contratos/adjudicaciones/${d.id}` } )) if (contracts.length > 0) { const contract = contracts[0] diff --git a/app/javascript/gobierto_visualizations/webapp/containers/contracts/ContractsIndex.vue b/app/javascript/gobierto_visualizations/webapp/containers/contracts/ContractsIndex.vue index e9d95226a3..1a3f98ae87 100644 --- a/app/javascript/gobierto_visualizations/webapp/containers/contracts/ContractsIndex.vue +++ b/app/javascript/gobierto_visualizations/webapp/containers/contracts/ContractsIndex.vue @@ -60,7 +60,7 @@ export default { .filter(contract => contract.assignee.toLowerCase() .includes(this.value.toLowerCase()) || contract.title.toLowerCase() .includes(this.value.toLowerCase())) - .map(d => ({ ...d, href: `${location.origin}${location.pathname}/${d.id}` } )) + .map(d => ({ ...d, href: `${location.origin}/visualizaciones/contratos/adjudicaciones/${d.id}` } )) }, goesToTableItem(item) { const { id: routingId } = item From 9549f972f7d0a5992f8170901591b3c50d73e9f0 Mon Sep 17 00:00:00 2001 From: Jorge Date: Thu, 22 Apr 2021 18:36:16 +0200 Subject: [PATCH 2/2] update search --- .../gobierto_visualizations/webapp/components/SearchFilter.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/javascript/gobierto_visualizations/webapp/components/SearchFilter.vue b/app/javascript/gobierto_visualizations/webapp/components/SearchFilter.vue index 672e084dac..7991b4abba 100644 --- a/app/javascript/gobierto_visualizations/webapp/components/SearchFilter.vue +++ b/app/javascript/gobierto_visualizations/webapp/components/SearchFilter.vue @@ -61,8 +61,9 @@ export default { }, handlerClearSearch() { this.search = '' - EventBus.$emit('filtered-items', this.data) + EventBus.$emit('filtered-items', this.search) EventBus.$emit('filtered-items-grouped', this.data) + EventBus.$emit('update-tab') } } }