Merge branch 'fix-team-filter-ui' of 'https://github.com/evamillan/gr…

…imoirelab-sortinghat'

Merges #796
Closes #796

releases/unreleased/show-organizations-members.yml

@@ -0,0 +1,9 @@
+---
+title: Show an organization's members
+category: fixed
+author: Eva Millan <evamillan@bitergia.com>
+issue: null
+notes: >
+  Repeatedly clicking on the button to see the members
+  of an organization or team on the table sometimes
+  showed the full individuals list.

ui/src/components/IndividualsTable.vue

@@ -714,10 +714,11 @@ export default {
         this.$logger.error(`Error updating enrollment: ${error}`, data);
       }
     },
-    filterSearch(filters, orderBy) {
+    filterSearch(filters, orderBy, inputValue) {
       this.filters = filters;
       this.orderBy = orderBy;
       this.queryIndividuals(1);
+      this.$emit("setFilters", inputValue);
     },
     selectAll(value) {
       this.individuals.forEach((individual) => (individual.isSelected = value));

ui/src/components/Search.vue

@@ -192,7 +192,7 @@ export default {
       this.parseFilters();
       if (this.errorMessage) return;
       const order = this.getOrder();
-      this.$emit("search", this.filters, order);
+      this.$emit("search", this.filters, order, this.inputValue);
     },
     parseFilters() {
       const terms = [];
@@ -288,7 +288,7 @@ export default {
       this.inputValue = "";
       this.filters = {};
       this.errorMessage = undefined;
-      this.$emit("search", {}, order);
+      this.$emit("search", {}, order, "");
     },
     isBooleanFilter(filter) {
       const validFilter = this.validFilters.find(

ui/src/views/Dashboard.vue

@@ -40,6 +40,7 @@
           :update-enrollment="updateEnrollment"
           :recommend-matches="recommendMatches"
           @saveIndividuals="addSavedIndividuals"
+          @setFilters="filters = $event"
           @updateOrganizations="updateOrganizations"
           @updateWorkspace="updateWorkspace"
           @highlight="highlightIndividual($event, 'highlightInWorkspace', true)"
@@ -319,7 +320,7 @@ export default {
         newFilters = newFilters.concat(` enrollmentParentOrg:"${parentOrg}"`);
       }
       if (this.filters === newFilters) {
-        this.filters = "";
+        this.$refs.table.queryIndividuals();
       }
       this.$nextTick(() => (this.filters = newFilters));
     },