From 89abb207b31a2e704473447190e815172a3e0733 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Fri, 8 Nov 2019 10:29:55 -0300
Subject: [PATCH] Finishes Filter by Author on Activities list. #330.

---
 src/admin/pages/lists/activities-page.vue     | 10 +++--
 .../scss/_dropdown-and-autocomplete.scss      |  4 ++
 src/js/store/modules/activity/actions.js      | 42 +++----------------
 3 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/src/admin/pages/lists/activities-page.vue b/src/admin/pages/lists/activities-page.vue
index a0d2212fa..bffbd1b33 100644
--- a/src/admin/pages/lists/activities-page.vue
+++ b/src/admin/pages/lists/activities-page.vue
@@ -85,9 +85,10 @@
                             <b-autocomplete
                                     :data="users"
                                     :placeholder="$i18n.get('instruction_type_search_users_filter')"
-                                    :keep-first="keepFirst"
-                                    :open-on-focus="openOnFocus"
-                                    @typing="fetchUsersForFiltering"
+                                    keep-first
+                                    open-on-focus
+                                    @input="fetchUsersForFiltering"
+                                    @focus.once="($event) => fetchUsersForFiltering($event.target.value)"
                                     @select="filterActivitiesByUser"
                                     :loading="isFetchingUsers"
                                     field="name"
@@ -447,6 +448,7 @@
                 ];
             },
             fetchUsersForFiltering: _.debounce(function (search) {
+
                 this.isFetchingUsers = true;
 
                 this.fetchUsers({ search: search })
@@ -543,7 +545,7 @@
             .button {
                 display: flex;
                 align-items: center;
-                border-radius: 0 !important;
+                border-radius: 0px !important;
                 height: 1.95rem !important;
             }
             
diff --git a/src/admin/scss/_dropdown-and-autocomplete.scss b/src/admin/scss/_dropdown-and-autocomplete.scss
index c3d62974b..407dde574 100644
--- a/src/admin/scss/_dropdown-and-autocomplete.scss
+++ b/src/admin/scss/_dropdown-and-autocomplete.scss
@@ -20,6 +20,10 @@
             cursor: default;
         }
     }
+    &>.control.has-icons-left .icon {
+        height: 2.125rem;
+        width: 2.125rem;
+    }
     .dropdown-menu {
         padding: 0px;
         margin-top: 0;
diff --git a/src/js/store/modules/activity/actions.js b/src/js/store/modules/activity/actions.js
index fbd3d33df..e01738345 100644
--- a/src/js/store/modules/activity/actions.js
+++ b/src/js/store/modules/activity/actions.js
@@ -21,18 +21,8 @@ export const fetchActivities = ({ commit }, { page, activitiesPerPage, search, s
         endpoint += '&' + qs.stringify(dateQuery);
     }
 
-    if (authorId != undefined && authorId != null) {
-        let metaQuery = {
-            metaquery: [
-                {
-                    value: authorId,
-                    key: 'user_id',
-                    compare: '='
-                }
-            ]
-        };
-        endpoint += '&' + qs.stringify(metaQuery);
-    }
+    if (authorId != undefined && authorId != null)
+        endpoint += '&authorid=' + authorId;
 
     return new Promise((resolve, reject) => {
         axios.tainacan.get(endpoint)
@@ -70,18 +60,8 @@ export const fetchCollectionActivities = ({ commit }, { page, activitiesPerPage,
         endpoint += '&' + qs.stringify(dateQuery);
     }
 
-    if (authorId != undefined && authorId != null) {
-        let metaQuery = {
-            metaquery: [
-                {
-                    value: authorId,
-                    key: 'user_id',
-                    compare: '='
-                }
-            ]
-        };
-        endpoint += '&' + qs.stringify(metaQuery);
-    }
+    if (authorId != undefined && authorId != null)
+        endpoint += '&authorid=' + authorId;
 
     return new Promise((resolve, reject) => {
         axios.tainacan.get(endpoint)
@@ -106,18 +86,8 @@ export const fetchItemActivities = ({ commit }, { page, activitiesPerPage, itemI
     if (search != undefined && search != '')
         endpoint += `&search=${search}`;
 
-    if (authorId != undefined && authorId != null) {
-        let metaQuery = {
-            metaquery: [
-                {
-                    value: authorId,
-                    key: 'user_id',
-                    compare: '='
-                }
-            ]
-        };
-        endpoint += '&' + qs.stringify(metaQuery);
-    }
+    if (authorId != undefined && authorId != null)
+        endpoint += '&authorid=' + authorId;
 
     if (searchDates && searchDates[0] != null && searchDates[1] != null) {
         let dateQuery = {